Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/util/nodelock/nodelock.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ func ReleaseNodeLock(nodeName string, lockname string, pod *corev1.Pod, skipNode
if !ok {
return nil
}
if !skipNodeLockOwnerCheck && !strings.HasSuffix(lockStr, fmt.Sprintf("%s%s", NodeLockSep, GeneratePodNamespaceName(pod, NodeLockSep))) {
// Keep backward compatibility with the legacy format, which is simply a timestamp
if !skipNodeLockOwnerCheck && strings.Contains(lockStr, NodeLockSep) && !strings.HasSuffix(lockStr, NodeLockSep+GeneratePodNamespaceName(pod, NodeLockSep)) {
klog.InfoS("NodeLock is not set by this pod", NodeLockKey, lockStr, "podName", pod.Name, "podNamespace", pod.Namespace)
return nil
}
Expand Down
45 changes: 40 additions & 5 deletions pkg/util/nodelock/nodelock_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,10 @@ func TestReleaseNodeLock(t *testing.T) {
timeout bool
}
tests := []struct {
name string
args args
wantErr bool
name string
args args
wantErr bool
checkNodeLock bool
}{
{
name: "node not found",
Expand Down Expand Up @@ -323,14 +324,48 @@ func TestReleaseNodeLock(t *testing.T) {
},
},
},
wantErr: false,
wantErr: false,
checkNodeLock: true,
},
{
name: "node lock is legacy timestamp format",
args: args{
nodeName: func() string {
name := "worker-5"
client.KubeClient.CoreV1().Nodes().Create(context.TODO(), &corev1.Node{
ObjectMeta: metav1.ObjectMeta{Name: name, Annotations: map[string]string{
NodeLockKey: "2026-07-03T15:35:10+08:00",
}},
}, metav1.CreateOptions{})
return name
},
pod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "hami",
Namespace: "hami-ns",
},
},
},
wantErr: false,
checkNodeLock: true,
},
Comment thread
DSFans2014 marked this conversation as resolved.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if err := ReleaseNodeLock(tt.args.nodeName(), tt.args.lockname, tt.args.pod, tt.args.timeout); (err != nil) != tt.wantErr {
nodeName := tt.args.nodeName()
if err := ReleaseNodeLock(nodeName, tt.args.lockname, tt.args.pod, tt.args.timeout); (err != nil) != tt.wantErr {
t.Errorf("ReleaseNodeLock() error = %v, wantErr %v", err, tt.wantErr)
}

if tt.checkNodeLock {
node, err := client.KubeClient.CoreV1().Nodes().Get(context.TODO(), nodeName, metav1.GetOptions{})
if err != nil {
t.Fatalf("failed to get node %s after releasing lock: %v", nodeName, err)
}
if _, ok := node.Annotations[NodeLockKey]; ok {
t.Errorf("expected %s annotation to be removed from node %s", NodeLockKey, nodeName)
}
}
})
}
}
Expand Down
Loading