fix db transaction bug

Signed-off-by: Catherine <tuhongj@cn.ibm.com>
IBM · Dec 24, 2024 · 2875705 · 2875705
1 parent 9ac7a90
commit 2875705
Show file tree

Hide file tree

Showing 21 changed files with 150 additions and 188 deletions.
diff --git a/scripts/cloudrc b/scripts/cloudrc
@@ -135,5 +135,5 @@ function get_uss_gateway()
 {
     uss_name=$(hostname -s | tr -s '-' '_')
     uss_id=$(wds_curl GET "api/v2/wds/uss?name=$uss_name" | jq -r '.uss_gateways[0].id')
-    [ -z "$uss_id" ] && uss_id=$(wds_curl GET "api/v2/wds/uss" | jq --arg hname $(hostname -s) -r '.uss_gateways | .[] | select(.server_name == $hname) | .id')
+    [ -z "$uss_id" -o "$uss_id" = null ] && uss_id=$(wds_curl GET "api/v2/wds/uss" | jq --arg hname $(hostname -s) -r '.uss_gateways | .[] | select(.server_name == $hname) | .id')
 }
diff --git a/scripts/kvm/report_rc.sh b/scripts/kvm/report_rc.sh
@@ -82,6 +82,7 @@ function sync_instance()
     boot_file=/proc/sys/kernel/random/boot_id
     diff $flag_file $boot_file
     [ $? -eq 0 ] && return
+    sudo iptables-restore </etc/iptables.rules
     bridges=$(cat /proc/net/dev | grep br | awk -F: '{print $1}')
     sudo iptables -N secgroup-chain && sudo iptables -A secgroup-chain -j ACCEPT
     for bridge in $bridges; do
@@ -163,6 +164,6 @@ function calc_resource()
 calc_resource
 sync_instance
 #probe_arp >/dev/null 2>&1
-#inst_status
+inst_status
 #vlan_status
 #router_status
diff --git a/web/.version b/web/.version
@@ -1 +1 @@
-v1.0.0-102-gd16fa1a
+v1.0.0-103-g9ac7a90
diff --git a/web/apitest/subnet_post.sh b/web/apitest/subnet_post.sh
@@ -9,6 +9,7 @@ cat >tmp.json <<EOF
 EOF
 
 vpc_id=$(curl -k -XPOST -H "Authorization: bearer $token" -H "X-Resource-User: cathy" -H "X-Resource-Org: cathy" "$endpoint/api/v1/vpcs" -d @./tmp.json | jq -r .id)
+echo vpc $vpc_id created
 
 cat >tmp.json <<EOF
 {

diff --git a/web/apitest/tmp.json b/web/apitest/tmp.json
@@ -1,5 +1,7 @@
 {
-  "instance": {
-    "id": "624132f5-8d20-48bc-917d-f59952b9ff31"
+  "name": "subnet-4260",
+  "network_cidr": "10.240.117.0/24",
+  "vpc": {
+    "id": "25c98d0d-6708-4f68-893a-97b318076233"
   }
 }
diff --git a/web/src/common/db.go b/web/src/common/db.go
@@ -37,3 +37,32 @@ func GetContextDB(ctx context.Context) (context.Context, *gorm.DB) {
 	ctx = context.WithValue(ctx, contextDBKey, db)
 	return ctx, db
 }
+
+func SetContextDB(ctx context.Context, db *gorm.DB) (context.Context) {
+	ctx = context.WithValue(ctx, contextDBKey, db)
+	return ctx
+}
+
+func StartTransaction(ctx context.Context) (context.Context, *gorm.DB, bool) {
+	tx := ctx.Value(contextDBKey)
+	if tx != nil {
+		// returns old transaction
+		return ctx, tx.(*gorm.DB), false
+	}
+	db := DB().Begin()
+	ctx = context.WithValue(ctx, contextDBKey, db)
+	// returns new transaction
+	return ctx, db, true
+}
+
+func EndTransaction(ctx context.Context, err error) {
+	tx := ctx.Value(contextDBKey)
+	if tx != nil {
+		db := tx.(*gorm.DB)
+		if err != nil {
+			db.Rollback()
+		} else {
+			db.Commit()
+		}
+	}
+}
diff --git a/web/src/common/interface.go b/web/src/common/interface.go
@@ -42,24 +42,18 @@ type VlanInfo struct {
 	SecRules   []*SecurityData `json:"security"`
 }
 
-func AllocateAddress(ctx context.Context, subnetID, ifaceID int64, ipaddr, addrType string) (address *model.Address, err error) {
+func AllocateAddress(ctx context.Context, subnet *model.Subnet, ifaceID int64, ipaddr, addrType string) (address *model.Address, err error) {
 	var db *gorm.DB
 	ctx, db = GetContextDB(ctx)
-	subnet := &model.Subnet{Model: model.Model{ID: subnetID}}
-	err = db.Take(subnet).Error
-	if err != nil {
-		log.Println("Failed to query subnet", err)
-		return
-	}
-	address = &model.Address{Subnet: subnet}
+	address = &model.Address{}
 	if ipaddr == "" {
-		err = db.Set("gorm:query_option", "FOR UPDATE").Where("subnet_id = ? and allocated = ? and address != ?", subnetID, false, subnet.Gateway).Take(address).Error
+		err = db.Set("gorm:query_option", "FOR UPDATE").Where("subnet_id = ? and allocated = ? and address != ?", subnet.ID, false, subnet.Gateway).Take(address).Error
 	} else {
 		if !strings.Contains(ipaddr, "/") {
 			preSize, _ := net.IPMask(net.ParseIP(subnet.Netmask).To4()).Size()
 			ipaddr = fmt.Sprintf("%s/%d", ipaddr, preSize)
 		}
-		err = db.Set("gorm:query_option", "FOR UPDATE").Where("subnet_id = ? and allocated = ? and address = ?", subnetID, false, ipaddr).Take(address).Error
+		err = db.Set("gorm:query_option", "FOR UPDATE").Where("subnet_id = ? and allocated = ? and address = ?", subnet.ID, false, ipaddr).Take(address).Error
 	}
 	if err != nil {
 		log.Println("Failed to query address, %v", err)
@@ -77,8 +71,7 @@ func AllocateAddress(ctx context.Context, subnetID, ifaceID int64, ipaddr, addrT
 }
 
 func DeallocateAddress(ctx context.Context, ifaces []*model.Interface) (err error) {
-	var db *gorm.DB
-	ctx, db = GetContextDB(ctx)
+	ctx, db := GetContextDB(ctx)
 	where := ""
 	for i, iface := range ifaces {
 		if i == 0 {
@@ -144,7 +137,7 @@ func CreateInterface(ctx context.Context, subnet *model.Subnet, ID, owner int64,
 		log.Println("Failed to create interface, ", err)
 		return
 	}
-	iface.Address, err = AllocateAddress(ctx, subnet.ID, iface.ID, address, "native")
+	iface.Address, err = AllocateAddress(ctx, subnet, iface.ID, address, "native")
 	if err != nil {
 		log.Println("Failed to allocate address", err)
 		err2 := db.Delete(iface).Error
@@ -157,8 +150,7 @@ func CreateInterface(ctx context.Context, subnet *model.Subnet, ID, owner int64,
 }
 
 func DeleteInterfaces(ctx context.Context, masterID, subnetID int64, ifType string) (err error) {
-	var db *gorm.DB
-	ctx, db = GetContextDB(ctx)
+	ctx, db := GetContextDB(ctx)
 	ifaces := []*model.Interface{}
 	where := ""
 	if subnetID > 0 {

diff --git a/web/src/routes/flavor.go b/web/src/routes/flavor.go
@@ -31,20 +31,17 @@ type FlavorAdmin struct{}
 type FlavorView struct{}
 
 func (a *FlavorAdmin) Create(ctx context.Context, name string, cpu, memory, disk int32) (flavor *model.Flavor, err error) {
-	ctx, db := GetContextDB(ctx)
 	memberShip := GetMemberShip(ctx)
 	permit := memberShip.CheckPermission(model.Admin)
 	if !permit {
 		log.Println("Not authorized for this operation")
 		err = fmt.Errorf("Not authorized")
 		return
 	}
-	db = db.Begin()
+	ctx, db, newTransaction := StartTransaction(ctx)
 	defer func() {
-		if err == nil {
-			db.Commit()
-		} else {
-			db.Rollback()
+		if newTransaction {
+			EndTransaction(ctx, err)
 		}
 	}()
 	flavor = &model.Flavor{
@@ -92,13 +89,10 @@ func (a *FlavorAdmin) Delete(ctx context.Context, flavor *model.Flavor) (err err
 		err = fmt.Errorf("Not authorized")
 		return
 	}
-	ctx, db := GetContextDB(ctx)
-	db = db.Begin()
+	ctx, db, newTransaction := StartTransaction(ctx)
 	defer func() {
-		if err == nil {
-			db.Commit()
-		} else {
-			db.Rollback()
+		if newTransaction {
+			EndTransaction(ctx, err)
 		}
 	}()
 	if err = db.Delete(flavor).Error; err != nil {

diff --git a/web/src/routes/floatingip.go b/web/src/routes/floatingip.go
@@ -50,13 +50,10 @@ func (a *FloatingIpAdmin) Create(ctx context.Context, instance *model.Instance,
 		err = fmt.Errorf("Subnet must be public")
 		return
 	}
-	ctx, db := GetContextDB(ctx)
-	db = db.Begin()
+	ctx, db, newTransaction := StartTransaction(ctx)
 	defer func() {
-		if err == nil {
-			db.Commit()
-		} else {
-			db.Rollback()
+		if newTransaction {
+			EndTransaction(ctx, err)
 		}
 	}()
 	floatingIp = &model.FloatingIp{Model: model.Model{Creater: memberShip.UserID}, Owner: memberShip.OrgID}
@@ -221,13 +218,10 @@ func (a *FloatingIpAdmin) GetFloatingIpByUUID(ctx context.Context, uuID string)
 }
 
 func (a *FloatingIpAdmin) Detach(ctx context.Context, floatingIp *model.FloatingIp) (err error) {
-	ctx, db := GetContextDB(ctx)
-	db = db.Begin()
+	ctx, db, newTransaction := StartTransaction(ctx)
 	defer func() {
-		if err == nil {
-			db.Commit()
-		} else {
-			db.Rollback()
+		if newTransaction {
+			EndTransaction(ctx, err)
 		}
 	}()
 	if floatingIp.Instance != nil {
@@ -251,13 +245,10 @@ func (a *FloatingIpAdmin) Detach(ctx context.Context, floatingIp *model.Floating
 }
 
 func (a *FloatingIpAdmin) Delete(ctx context.Context, floatingIp *model.FloatingIp) (err error) {
-	ctx, db := GetContextDB(ctx)
-	db = db.Begin()
+	ctx, _, newTransaction := StartTransaction(ctx)
 	defer func() {
-		if err == nil {
-			db.Commit()
-		} else {
-			db.Rollback()
+		if newTransaction {
+			EndTransaction(ctx, err)
 		}
 	}()
 	if floatingIp.Instance != nil {

diff --git a/web/src/routes/image.go b/web/src/routes/image.go
@@ -39,13 +39,10 @@ func FileExist(filename string) bool {
 
 func (a *ImageAdmin) Create(ctx context.Context, name, osVersion, virtType, userName, url, architecture string, instID int64) (image *model.Image, err error) {
 	memberShip := GetMemberShip(ctx)
-	ctx, db := GetContextDB(ctx)
-	db = db.Begin()
+	ctx, db, newTransaction := StartTransaction(ctx)
 	defer func() {
-		if err == nil {
-			db.Commit()
-		} else {
-			db.Rollback()
+		if newTransaction {
+			EndTransaction(ctx, err)
 		}
 	}()
 	image = &model.Image{Model: model.Model{Creater: memberShip.UserID}, Owner: memberShip.OrgID, OsVersion: osVersion, VirtType: virtType, UserName: userName, Name: name, OSCode: name, Status: "creating", Architecture: architecture}
@@ -150,13 +147,10 @@ func (a *ImageAdmin) GetImage(ctx context.Context, reference *BaseReference) (im
 }
 
 func (a *ImageAdmin) Delete(ctx context.Context, image *model.Image) (err error) {
-	ctx, db := GetContextDB(ctx)
-	db = db.Begin()
+	ctx, db, newTransaction := StartTransaction(ctx)
 	defer func() {
-		if err == nil {
-			db.Commit()
-		} else {
-			db.Rollback()
+		if newTransaction {
+			EndTransaction(ctx, err)
 		}
 	}()
 	memberShip := GetMemberShip(ctx)

diff --git a/web/src/routes/instance.go b/web/src/routes/instance.go
@@ -107,16 +107,13 @@ func (a *InstanceAdmin) getHyperGroup(ctx context.Context, imageType string, zon
 }
 
 func (a *InstanceAdmin) Create(ctx context.Context, count int, prefix, userdata string, image *model.Image, flavor *model.Flavor, zone *model.Zone, routerID int64, primaryIface *InterfaceInfo, secondaryIfaces []*InterfaceInfo, keys []*model.Key, hyperID int) (instances []*model.Instance, err error) {
-	memberShip := GetMemberShip(ctx)
-	ctx, db := GetContextDB(ctx)
-	db = db.Begin()
+	ctx, db, newTransaction := StartTransaction(ctx)
 	defer func() {
-		if err == nil {
-			db.Commit()
-		} else {
-			db.Rollback()
+		if newTransaction {
+			EndTransaction(ctx, err)
 		}
 	}()
+	memberShip := GetMemberShip(ctx)
 	if image.Status != "available" {
 		err = fmt.Errorf("Image status not available")
 		log.Println("Image status not available")
@@ -237,13 +234,10 @@ func (a *InstanceAdmin) Update(ctx context.Context, instance *model.Instance, fl
 		return
 	}
 
-	ctx, db := GetContextDB(ctx)
-	db = db.Begin()
+	ctx, db, newTransaction := StartTransaction(ctx)
 	defer func() {
-		if err == nil {
-			db.Commit()
-		} else {
-			db.Rollback()
+		if newTransaction {
+			EndTransaction(ctx, err)
 		}
 	}()
 	if hyperID != int(instance.Hyper) {
@@ -437,13 +431,10 @@ func (a *InstanceAdmin) buildMetadata(ctx context.Context, primaryIface *Interfa
 }
 
 func (a *InstanceAdmin) Delete(ctx context.Context, instance *model.Instance) (err error) {
-	ctx, db := GetContextDB(ctx)
-	db = db.Begin()
+	ctx, db, newTransaction := StartTransaction(ctx)
 	defer func() {
-		if err == nil {
-			db.Commit()
-		} else {
-			db.Rollback()
+		if newTransaction {
+			EndTransaction(ctx, err)
 		}
 	}()
 	memberShip := GetMemberShip(ctx)

diff --git a/web/src/routes/interface.go b/web/src/routes/interface.go
@@ -40,7 +40,12 @@ type InterfaceAdmin struct{}
 type InterfaceView struct{}
 
 func (a *InterfaceAdmin) Update(ctx context.Context, id int64, name, pairs string, sgIDs []int64) (iface *model.Interface, err error) {
-	db := DB()
+	ctx, db, newTransaction := StartTransaction(ctx)
+	defer func() {
+		if newTransaction {
+			EndTransaction(ctx, err)
+		}
+	}()
 	iface = &model.Interface{Model: model.Model{ID: id}}
 	if err = db.Set("gorm:auto_preload", true).Take(iface).Error; err != nil {
 		log.Println("Failed to query interface ", err)

diff --git a/web/src/routes/key.go b/web/src/routes/key.go
@@ -78,13 +78,10 @@ func (a *KeyAdmin) Create(ctx context.Context, name, publicKey string) (key *mod
 		return
 	}
 	fingerPrint := ssh.FingerprintLegacyMD5(pub)
-	ctx, db := GetContextDB(ctx)
-	db = db.Begin()
+	ctx, db, newTransaction := StartTransaction(ctx)
 	defer func() {
-		if err == nil {
-			db.Commit()
-		} else {
-			db.Rollback()
+		if newTransaction {
+			EndTransaction(ctx, err)
 		}
 	}()
 	key = &model.Key{Model: model.Model{Creater: memberShip.UserID}, Owner: memberShip.OrgID, Name: name, PublicKey: publicKey, FingerPrint: fingerPrint}
@@ -97,13 +94,10 @@ func (a *KeyAdmin) Create(ctx context.Context, name, publicKey string) (key *mod
 }
 
 func (a *KeyAdmin) Delete(ctx context.Context, key *model.Key) (err error) {
-	ctx, db := GetContextDB(ctx)
-	db = db.Begin()
+	ctx, db, newTransaction := StartTransaction(ctx)
 	defer func() {
-		if err == nil {
-			db.Commit()
-		} else {
-			db.Rollback()
+		if newTransaction {
+			EndTransaction(ctx, err)
 		}
 	}()
 	memberShip := GetMemberShip(ctx)
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ cat >tmp.json <<EOF @@
     EOF
     vpc_id=$(curl -k -XPOST -H "Authorization: bearer $token" -H "X-Resource-User: cathy" -H "X-Resource-Org: cathy" "$endpoint/api/v1/vpcs" -d @./tmp.json | jq -r .id)
+    echo vpc $vpc_id created
     cat >tmp.json <<EOF
     {
@@ Expand Down @@