fix: enable ID allocation for lb_listener and clean up out-of-range data

Author: ZhengYa-0110

server/controller/db/metadb/migrator/common/init.go

@@ -50,7 +50,9 @@ func InitCETables(dc *DBConfig) error {
 func InitTables(dc *DBConfig, rawSqlDir string) error {
 	log.Info(LogDBName(dc.Config.Database, "initialize %s tables", rawSqlDir))
 
-	for _, sqlFile := range GetSortedSQLFiles(rawSqlDir, false) {
+	sortedFiles := GetSortedSQLFiles(rawSqlDir, false)
+	log.Info(LogDBName(dc.Config.Database, "files to executed: %v", sortedFiles))
+	for _, sqlFile := range sortedFiles {
 		err := ReadAndExecuteSqlFile(dc, sqlFile)
 		if err != nil {
 			return err
@@ -59,7 +61,9 @@ func InitTables(dc *DBConfig, rawSqlDir string) error {
 
 	// 通过判断数据库名称后缀，判断数据库是否是 default 组织。
 	if !strings.HasSuffix(dc.Config.Database, common.NON_DEFAULT_ORG_DATABASE_SUFFIX) {
-		for _, sqlFile := range GetSortedSQLFiles(rawSqlDir, true) {
+		sortedFiles := GetSortedSQLFiles(rawSqlDir, true)
+		log.Info(LogDBName(dc.Config.Database, "files to be executed: %v", sortedFiles))
+		for _, sqlFile := range sortedFiles {
 			err := ReadAndExecuteSqlFile(dc, sqlFile)
 			if err != nil {
 				return err

server/controller/db/metadb/migrator/schema/const.go

@@ -20,5 +20,5 @@ const (
 	RAW_SQL_ROOT_DIR = "/etc/metadb/schema/rawsql"
 
 	DB_VERSION_TABLE    = "db_version"
-	DB_VERSION_EXPECTED = "6.6.1.70"
+	DB_VERSION_EXPECTED = "6.6.1.71"
 )

server/controller/db/metadb/migrator/schema/rawsql/mysql/issu/6.6.1.71.sql

@@ -0,0 +1,12 @@
+
+-- Clean up lb_listener rows whose id exceeds the ID pool upper bound (ResourceMaxID1 default 499999).
+-- These IDs cannot be managed by the allocator and must be removed before enabling ID allocation.
+DELETE FROM lb_listener WHERE id > 499999;
+
+-- Clean up lb_target_server rows that reference a non-existent lb_listener.
+-- This covers both pre-existing orphans and rows whose lb_listener was just removed above.
+DELETE FROM lb_target_server
+WHERE lb_listener_id NOT IN (SELECT id FROM lb_listener);
+
+-- Update DB version
+UPDATE db_version SET version='6.6.1.71';

server/controller/db/metadb/model/constraint.go

@@ -53,7 +53,7 @@ type AssetResourceConstraint interface {
 type ResourceNeedBeAllocatedIDConstraint interface {
 	Region | AZ | SubDomain | Host | VM |
 		VPC | Network | VRouter | DHCPPort |
-		NATGateway | LB | CEN |
+		NATGateway | LB | LBListener | CEN |
 		PeerConnection | RDSInstance | RedisInstance | PodCluster |
 		PodNode | VMPodNodeConnection | PodNamespace | PodIngress |
 		PodService | PodGroup | PodReplicaSet |

server/controller/recorder/db/idmng/manager.go

@@ -65,6 +65,7 @@ func newIDManager(cfg RecorderConfig, orgID int) (*IDManager, error) {
 		ctrlrcommon.RESOURCE_TYPE_REDIS_INSTANCE_EN:  newIDPool[mysqlmodel.RedisInstance](mng.org, ctrlrcommon.RESOURCE_TYPE_REDIS_INSTANCE_EN, cfg.ResourceMaxID1),
 		ctrlrcommon.RESOURCE_TYPE_NAT_GATEWAY_EN:     newIDPool[mysqlmodel.NATGateway](mng.org, ctrlrcommon.RESOURCE_TYPE_NAT_GATEWAY_EN, cfg.ResourceMaxID1),
 		ctrlrcommon.RESOURCE_TYPE_LB_EN:              newIDPool[mysqlmodel.LB](mng.org, ctrlrcommon.RESOURCE_TYPE_LB_EN, cfg.ResourceMaxID1),
+		ctrlrcommon.RESOURCE_TYPE_LB_LISTENER_EN:     newIDPool[mysqlmodel.LBListener](mng.org, ctrlrcommon.RESOURCE_TYPE_LB_LISTENER_EN, cfg.ResourceMaxID1),
 		ctrlrcommon.RESOURCE_TYPE_POD_NODE_EN:        newIDPool[mysqlmodel.PodNode](mng.org, ctrlrcommon.RESOURCE_TYPE_POD_NODE_EN, cfg.ResourceMaxID1),
 		ctrlrcommon.RESOURCE_TYPE_POD_SERVICE_EN:     newIDPool[mysqlmodel.PodService](mng.org, ctrlrcommon.RESOURCE_TYPE_POD_SERVICE_EN, cfg.ResourceMaxID1),
 		ctrlrcommon.RESOURCE_TYPE_POD_EN:             newIDPool[mysqlmodel.Pod](mng.org, ctrlrcommon.RESOURCE_TYPE_POD_EN, cfg.ResourceMaxID1),

server/controller/recorder/db/lb_listener.go

@@ -30,7 +30,7 @@ func NewLBListener() *LBListener {
 		newOperatorBase[*mysqlmodel.LBListener](
 			ctrlrcommon.RESOURCE_TYPE_LB_LISTENER_EN,
 			true,
-			false,
+			true,
 		),
 	}
 	operater.setFieldsNeededAfterCreate([]string{"id", "lcuuid", "name", "ips", "snat_ips", "port", "protocol"})