github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(api): only error on ping failure for snapshots (#3177)

pull/3181/head
Anthony Lapenna 2019-09-20 16:13:44 +12:00 committed by GitHub
parent baa64ca927
commit a5e5983c28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/docker/snapshot.go
View File

@ -2,6 +2,7 @@ package docker
import ( import (
"context" "context"
"log"
"time" "time"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
@ -10,7 +11,7 @@ import (
"github.com/portainer/portainer/api" "github.com/portainer/portainer/api"
) )
func snapshot(cli *client.Client) (*portainer.Snapshot, error) { func snapshot(cli *client.Client, endpoint *portainer.Endpoint) (*portainer.Snapshot, error) {
_, err := cli.Ping(context.Background()) _, err := cli.Ping(context.Background())
if err != nil { if err != nil {
return nil, err return nil, err
@ -22,44 +23,44 @@ func snapshot(cli *client.Client) (*portainer.Snapshot, error) {
err = snapshotInfo(snapshot, cli) err = snapshotInfo(snapshot, cli)
if err != nil { if err != nil {
return nil, err log.Printf("[WARN] [docker,snapshot] [message: unable to snapshot engine information] [endpoint: %s] [err: %s]", endpoint.Name, err)
} }
if snapshot.Swarm { if snapshot.Swarm {
err = snapshotSwarmServices(snapshot, cli) err = snapshotSwarmServices(snapshot, cli)
if err != nil { if err != nil {
return nil, err log.Printf("[WARN] [docker,snapshot] [message: unable to snapshot Swarm services] [endpoint: %s] [err: %s]", endpoint.Name, err)
} }
err = snapshotNodes(snapshot, cli) err = snapshotNodes(snapshot, cli)
if err != nil { if err != nil {
return nil, err log.Printf("[WARN] [docker,snapshot] [message: unable to snapshot Swarm nodes] [endpoint: %s] [err: %s]", endpoint.Name, err)
} }
} }
err = snapshotContainers(snapshot, cli) err = snapshotContainers(snapshot, cli)
if err != nil { if err != nil {
return nil, err log.Printf("[WARN] [docker,snapshot] [message: unable to snapshot containers] [endpoint: %s] [err: %s]", endpoint.Name, err)
} }
err = snapshotImages(snapshot, cli) err = snapshotImages(snapshot, cli)
if err != nil { if err != nil {
return nil, err log.Printf("[WARN] [docker,snapshot] [message: unable to snapshot images] [endpoint: %s] [err: %s]", endpoint.Name, err)
} }
err = snapshotVolumes(snapshot, cli) err = snapshotVolumes(snapshot, cli)
if err != nil { if err != nil {
return nil, err log.Printf("[WARN] [docker,snapshot] [message: unable to snapshot volumes] [endpoint: %s] [err: %s]", endpoint.Name, err)
} }
err = snapshotNetworks(snapshot, cli) err = snapshotNetworks(snapshot, cli)
if err != nil { if err != nil {
return nil, err log.Printf("[WARN] [docker,snapshot] [message: unable to snapshot networks] [endpoint: %s] [err: %s]", endpoint.Name, err)
} }
err = snapshotVersion(snapshot, cli) err = snapshotVersion(snapshot, cli)
if err != nil { if err != nil {
return nil, err log.Printf("[WARN] [docker,snapshot] [message: unable to snapshot engine version] [endpoint: %s] [err: %s]", endpoint.Name, err)
} }
snapshot.Time = time.Now().Unix() snapshot.Time = time.Now().Unix()

2
api/docker/snapshotter.go
View File

@ -24,5 +24,5 @@ func (snapshotter *Snapshotter) CreateSnapshot(endpoint *portainer.Endpoint) (*p
} }
defer cli.Close() defer cli.Close()
return snapshot(cli) return snapshot(cli, endpoint)
} }