Properly resume management of volumes on startup when continueOnNotReady is enabled

Signed-off-by: James Munnelly <[email protected]>

Author: munnerz

driver/nodeserver.go

@@ -68,6 +68,14 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
 		return nil, status.Error(codes.InvalidArgument, "pod.spec.volumes[].csi.readOnly must be set to 'true'")
 	}
 
+	// If continueOnNotReady is enabled, set the NextIssuanceTime in the metadata file to epoch.
+	// This allows the manager to start management for the volume again on restart if the first
+	// issuance did not successfully complete.
+	if meta.NextIssuanceTime == nil && ns.continueOnNotReady {
+		epoch := time.Time{}
+		meta.NextIssuanceTime = &epoch
+	}
+
 	if registered, err := ns.store.RegisterMetadata(meta); err != nil {
 		return nil, err
 	} else {

manager/manager.go

@@ -189,6 +189,12 @@ func NewManager(opts Options) (*Manager, error) {
 			// not able to clean up the state store before an unexpected exit.
 			// Whatever is calling the CSI plugin should call NodePublishVolume again relatively soon
 			// after we start up, which will trigger management to resume.
+			// Note: if continueOnNotReady is set to 'true', the metadata file will persist the nextIssuanceTime
+			//       as the 'now' time of the NodePublishVolume call. We will therefore resume management of
+			//       these volumes despite there not having been a successful initial issuance.
+			//       For users upgrading from an older version of the csi-lib, this field will not be set.
+			//       These pods will only have management begun again upon the next NodePublishVolume call, which
+			//       may not happen at all unless `requireRepublish: true` is set on the CSIDriver object.
 			// TODO: we should probably consider deleting the volume from the state store in these instances
 			//       to avoid having leftover metadata files for pods that don't actually exist anymore.
 			log.Info("Skipping management of volume that has never successfully completed")