Fix transaction error

whywaita · Feb 28, 2024 · 8a552bb · 8a552bb
1 parent 51a576c
commit 8a552bb
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/server/pkg/api/server_add_instance.go b/server/pkg/api/server_add_instance.go
@@ -81,18 +81,27 @@ func (s *ShoesLXDMultiServer) AddInstance(ctx context.Context, req *pb.AddInstan
 	if err != nil {
 		// Do rollback
 		l.Info("failed to start instance, will delete", "err", err.Error(), "failed_method", "client.UpdateInstanceState()")
-		if _, err := client.DeleteInstance(instanceName); err != nil {
+		op, err := client.DeleteInstance(instanceName)
+		if err != nil {
 			l.Warn("failed to delete instance", "err", err.Error())
 		}
+		if err := op.Wait(); err != nil {
+			l.Warn("failed to wait deleting instance", "err", err.Error())
+		}
 
 		return nil, status.Errorf(codes.Internal, "failed to start instance: %+v", err)
 	}
 	if err := op.Wait(); err != nil && !strings.EqualFold(err.Error(), "The instance is already running") {
 		// Do rollback
 		l.Info("failed to start instance, will delete", "err", err.Error(), "failed_method", "op.Wait()")
-		if _, err := client.DeleteInstance(instanceName); err != nil {
+		op, err := client.DeleteInstance(instanceName)
+		if err != nil {
 			l.Warn("failed to delete instance", "err", err.Error())
 		}
+		if err := op.Wait(); err != nil {
+			l.Warn("failed to wait deleting instance", "err", err.Error())
+		}
+
 		return nil, status.Errorf(codes.Internal, "failed to wait starting instance: %+v", err)
 	}