@@ -39,7 +39,7 @@ import (
3939 "github.com/gitpod-io/gitpod/ws-manager/api"
4040 "github.com/gitpod-io/gitpod/ws-manager/pkg/manager/internal/workpool"
4141
42- volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v6 /apis/volumesnapshot/v1"
42+ volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4 /apis/volumesnapshot/v1"
4343)
4444
4545const (
@@ -870,13 +870,13 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb
870870 deletedPVC bool
871871 pvcFeatureEnabled bool
872872 markVolumeSnapshotAnnotation bool
873- pvcVolumeSnapshotName string
873+ // volume snapshot name is 1:1 mapped to workspace id
874+ pvcVolumeSnapshotName string = workspaceID
874875 pvcVolumeSnapshotContentName string
875876 pvcVolumeSnapshotClassName string
876877 )
877878 if wso .Pod != nil {
878879 _ , pvcFeatureEnabled = wso .Pod .Labels [pvcWorkspaceFeatureAnnotation ]
879- pvcVolumeSnapshotName = workspaceID
880880 wsClassName := ""
881881 if _ , ok := wso .Pod .Labels [workspaceClassLabel ]; ok {
882882 wsClassName = wso .Pod .Labels [workspaceClassLabel ]
@@ -929,16 +929,14 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb
929929 }
930930
931931 if pvcFeatureEnabled {
932+ // pvc was created with the name of the pod. see createDefiniteWorkspacePod()
932933 pvcName := wso .Pod .Name
933934 if ! createdVolumeSnapshot {
934935 // create snapshot object out of PVC
935936 volumeSnapshot := & volumesnapshotv1.VolumeSnapshot {
936937 ObjectMeta : metav1.ObjectMeta {
937938 Name : pvcVolumeSnapshotName ,
938939 Namespace : m .manager .Config .Namespace ,
939- Labels : map [string ]string {
940- "workspaceID" : workspaceID ,
941- },
942940 },
943941 Spec : volumesnapshotv1.VolumeSnapshotSpec {
944942 Source : volumesnapshotv1.VolumeSnapshotSource {
@@ -949,7 +947,7 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb
949947 }
950948
951949 err = m .manager .Clientset .Create (ctx , volumeSnapshot )
952- if err != nil {
950+ if err != nil && ! k8serr . IsAlreadyExists ( err ) {
953951 err = xerrors .Errorf ("cannot create volumesnapshot: %v" , err )
954952 return true , nil , err
955953 }
@@ -963,6 +961,7 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb
963961 Jitter : 0.1 ,
964962 Cap : 10 * time .Minute ,
965963 }
964+ log = log .WithField ("VolumeSnapshot.Name" , pvcVolumeSnapshotName )
966965 err = wait .ExponentialBackoff (backoff , func () (bool , error ) {
967966 var volumeSnapshot volumesnapshotv1.VolumeSnapshot
968967 err := m .manager .Clientset .Get (ctx , types.NamespacedName {Namespace : m .manager .Config .Namespace , Name : pvcVolumeSnapshotName }, & volumeSnapshot )
@@ -971,37 +970,38 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb
971970 // volumesnapshot doesn't exist yet, retry again
972971 return false , nil
973972 }
974- log .WithError (err ).WithField ( "VolumeSnapshot.Name" , pvcVolumeSnapshotName ). Error ("was unable to get volume snapshot" )
973+ log .WithError (err ).Error ("was unable to get volume snapshot" )
975974 return false , err
976975 }
977976 if volumeSnapshot .Status != nil {
978- if volumeSnapshot .Status .ReadyToUse != nil && * (volumeSnapshot .Status .ReadyToUse ) {
977+ if volumeSnapshot .Status .ReadyToUse != nil && * (volumeSnapshot .Status .ReadyToUse ) && volumeSnapshot . Status . BoundVolumeSnapshotContentName != nil {
979978 pvcVolumeSnapshotContentName = * volumeSnapshot .Status .BoundVolumeSnapshotContentName
980979 return true , nil
981980 }
982981 if volumeSnapshot .Status .Error != nil {
983982 if volumeSnapshot .Status .Error .Message != nil {
984983 err = xerrors .Errorf ("error during volume snapshot creation: %s" , * volumeSnapshot .Status .Error .Message )
985- log .WithError (err ).WithField ( "VolumeSnapshot.Name" , pvcVolumeSnapshotName ). Error ("unable to create volume snapshot" )
984+ log .WithError (err ).Error ("unable to create volume snapshot" )
986985 return false , err
987986 }
988- log .WithField ( "VolumeSnapshot.Name" , pvcVolumeSnapshotName ). Error ("unknown error during volume snapshot creation" )
987+ log .Error ("unknown error during volume snapshot creation" )
989988 return false , xerrors .Errorf ("unknown error during volume snapshot creation" )
990989 }
991990 }
992991 return false , nil
993992 })
994993 if err != nil {
995- log .WithError (err ).WithField ( "VolumeSnapshot.Name" , pvcVolumeSnapshotName ). Errorf ("failed while waiting for volume snapshot to get ready" )
994+ log .WithError (err ).Errorf ("failed while waiting for volume snapshot to get ready" )
996995 return true , nil , err
997996 }
998997 readyVolumeSnapshot = true
999998 }
1000999 if readyVolumeSnapshot && ! markVolumeSnapshotAnnotation {
1000+ log = log .WithField ("VolumeSnapshotContent.Name" , pvcVolumeSnapshotContentName )
10011001 var volumeSnapshotContent volumesnapshotv1.VolumeSnapshotContent
10021002 err := m .manager .Clientset .Get (ctx , types.NamespacedName {Namespace : "" , Name : pvcVolumeSnapshotContentName }, & volumeSnapshotContent )
10031003 if err != nil {
1004- log .WithError (err ).WithField ( "VolumeSnapshotContent.Name" , pvcVolumeSnapshotContentName ). Error ("was unable to get volume snapshot content" )
1004+ log .WithError (err ).Error ("was unable to get volume snapshot content" )
10051005 return true , nil , err
10061006 }
10071007
@@ -1038,38 +1038,36 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb
10381038 },
10391039 },
10401040 )
1041- if pvcErr != nil {
1041+ if pvcErr != nil && ! k8serr . IsNotFound ( pvcErr ) {
10421042 log .WithError (pvcErr ).Errorf ("failed to delete pvc `%s`" , pvcName )
10431043 }
10441044 deletedPVC = true
10451045 }
1046- } else {
1047- if doSnapshot {
1048- // if this is a prebuild take a snapshot and mark the workspace
1049- var res * wsdaemon.TakeSnapshotResponse
1050- res , err = snc .TakeSnapshot (ctx , & wsdaemon.TakeSnapshotRequest {Id : workspaceID })
1046+ } else if doSnapshot {
1047+ // if this is a prebuild take a snapshot and mark the workspace
1048+ var res * wsdaemon.TakeSnapshotResponse
1049+ res , err = snc .TakeSnapshot (ctx , & wsdaemon.TakeSnapshotRequest {Id : workspaceID })
1050+ if err != nil {
1051+ tracing .LogError (span , err )
1052+ log .WithError (err ).Warn ("cannot take snapshot" )
1053+ err = xerrors .Errorf ("cannot take snapshot: %v" , err )
1054+ err = m .manager .markWorkspace (ctx , workspaceID , addMark (workspaceExplicitFailAnnotation , err .Error ()))
1055+ if err != nil {
1056+ log .WithError (err ).Warn ("was unable to mark workspace as failed" )
1057+ }
1058+ }
1059+
1060+ if res != nil {
1061+ err = m .manager .markWorkspace (context .Background (), workspaceID , addMark (workspaceSnapshotAnnotation , res .Url ))
10511062 if err != nil {
10521063 tracing .LogError (span , err )
1053- log .WithError (err ).Warn ("cannot take snapshot" )
1054- err = xerrors .Errorf ("cannot take snapshot: %v" , err )
1064+ log .WithError (err ).Warn ("cannot mark headless workspace with snapshot - that's one prebuild lost " )
1065+ err = xerrors .Errorf ("cannot remember snapshot: %v" , err )
10551066 err = m .manager .markWorkspace (ctx , workspaceID , addMark (workspaceExplicitFailAnnotation , err .Error ()))
10561067 if err != nil {
10571068 log .WithError (err ).Warn ("was unable to mark workspace as failed" )
10581069 }
10591070 }
1060-
1061- if res != nil {
1062- err = m .manager .markWorkspace (context .Background (), workspaceID , addMark (workspaceSnapshotAnnotation , res .Url ))
1063- if err != nil {
1064- tracing .LogError (span , err )
1065- log .WithError (err ).Warn ("cannot mark headless workspace with snapshot - that's one prebuild lost" )
1066- err = xerrors .Errorf ("cannot remember snapshot: %v" , err )
1067- err = m .manager .markWorkspace (ctx , workspaceID , addMark (workspaceExplicitFailAnnotation , err .Error ()))
1068- if err != nil {
1069- log .WithError (err ).Warn ("was unable to mark workspace as failed" )
1070- }
1071- }
1072- }
10731071 }
10741072 }
10751073
0 commit comments