Merge pull request #38 from digitalocean/small-improvements

controller: add logs to catch some weird issues
digitalocean · Jun 8, 2018 · 76b8455 · 76b8455
2 parents 362ace8 + 2132edb
commit 76b8455
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/driver/controller.go b/driver/controller.go
@@ -191,6 +191,10 @@ func (d *Driver) ControllerPublishVolume(ctx context.Context, req *csi.Controlle
 	if err != nil {
 		// don't do anything if attached
 		if (resp != nil && resp.StatusCode == http.StatusUnprocessableEntity) || strings.Contains(err.Error(), "This volume is already attached") {
+			ll.WithFields(logrus.Fields{
+				"error": err,
+				"resp":  resp,
+			}).Warn("assuming volume is attached already")
 			return &csi.ControllerPublishVolumeResponse{}, nil
 		}
 		return nil, err
@@ -229,6 +233,10 @@ func (d *Driver) ControllerUnpublishVolume(ctx context.Context, req *csi.Control
 	action, resp, err := d.doClient.StorageActions.DetachByDropletID(ctx, req.VolumeId, dropletID)
 	if err != nil {
 		if (resp != nil && resp.StatusCode == http.StatusUnprocessableEntity) || strings.Contains(err.Error(), "Attachment not found") {
+			ll.WithFields(logrus.Fields{
+				"error": err,
+				"resp":  resp,
+			}).Warn("assuming volume is detached already")
 			return &csi.ControllerUnpublishVolumeResponse{}, nil
 		}
 		return nil, err