Merge pull request Project-HAMi#35 from DSFans2014/refactor/defer_lock

refactor: defer `ReleaseNodeLock`

Author: hami-robot[bot]

internal/server/server.go

@@ -340,29 +340,25 @@ func (ps *PluginServer) GetPreferredAllocation(context.Context, *v1beta1.Preferr
 
 func (ps *PluginServer) Allocate(ctx context.Context, reqs *v1beta1.AllocateRequest) (*v1beta1.AllocateResponse, error) {
 	klog.V(5).Infof("Allocate: %v", reqs)
+	success := false
+	var pod *v1.Pod
+	defer func() {
+		lockerr := nodelock.ReleaseNodeLock(ps.nodeName, NodeLockAscend, pod, success)
+		if lockerr != nil {
+			klog.Errorf("failed to release lock:%s", lockerr.Error())
+		}
+	}()
 	pod, err := util.GetPendingPod(ctx, ps.nodeName)
 	if err != nil {
 		klog.Errorf("get pending pod error: %v", err)
-		lockerr := nodelock.ReleaseNodeLock(ps.nodeName, NodeLockAscend, pod, false)
-		if lockerr != nil {
-			klog.Errorf("failed to release lock:%s", err.Error())
-		}
 		return nil, fmt.Errorf("get pending pod error: %v", err)
 	}
 	resp := v1beta1.ContainerAllocateResponse{}
 	IDs, temps, err := ps.parsePodAnnotation(pod)
 	if err != nil {
-		lockerr := nodelock.ReleaseNodeLock(ps.nodeName, NodeLockAscend, pod, false)
-		if lockerr != nil {
-			klog.Errorf("failed to release lock:%s", err.Error())
-		}
 		return nil, fmt.Errorf("parse pod annotation error: %v", err)
 	}
 	if len(IDs) == 0 {
-		lockerr := nodelock.ReleaseNodeLock(ps.nodeName, NodeLockAscend, pod, false)
-		if lockerr != nil {
-			klog.Errorf("failed to release lock:%s", err.Error())
-		}
 		return nil, fmt.Errorf("empty id from pod annotation")
 	}
 	ascendVisibleDevices := fmt.Sprintf("%d", IDs[0])
@@ -382,10 +378,7 @@ func (ps *PluginServer) Allocate(ctx context.Context, reqs *v1beta1.AllocateRequ
 		resp.Envs["ASCEND_VNPU_SPECS"] = ascendVNPUSpec
 	}
 	klog.V(5).Infof("allocate response: %v", resp)
-	lockerr := nodelock.ReleaseNodeLock(ps.nodeName, NodeLockAscend, pod, true)
-	if lockerr != nil {
-		klog.Errorf("failed to release lock:%s", err.Error())
-	}
+	success = true
 	return &v1beta1.AllocateResponse{ContainerResponses: []*v1beta1.ContainerAllocateResponse{&resp}}, nil
 }