Skip to content

Commit d4aa137

Browse files
committed
修改流程错误,保证instances表中和version_histories表中新增的数据行使用同一个instanceID
1 parent 8ebf305 commit d4aa137

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

internal/deploy/service/deploy_service.go

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func (f *floyDeployService) DeployNewService(params *model.DeployNewServiceParam
216216
fmt.Printf("实例 %s 部署成功,IP: %s, 端口: %d\n", instanceID, instanceIP, instancePort)
217217

218218
// 6.9 将实例信息添加到数据库
219-
_, err = f.createInstanceRecord(params.Service, params.Version, selectedHost.HostID, hostIP, instanceIP, instancePort)
219+
_, err = f.createInstanceRecord(instanceID, params.Service, params.Version, selectedHost.HostID, hostIP, instanceIP, instancePort)
220220
if err != nil {
221221
fmt.Printf("创建实例记录失败: %v\n", err)
222222
// 继续处理,不因为数据库错误而中断部署流程
@@ -1029,22 +1029,16 @@ func (f *floyDeployService) runService(instanceIP, service, bashfile, installDir
10291029
}
10301030

10311031
// createInstanceRecord 创建实例记录到数据库
1032-
func (f *floyDeployService) createInstanceRecord(serviceName, serviceVersion, hostID, hostIP, instanceIP string, port int) (*model.Instance, error) {
1032+
func (f *floyDeployService) createInstanceRecord(instanceID, serviceName, serviceVersion, hostID, hostIP, instanceIP string, port int) (*model.Instance, error) {
10331033
// 初始化数据库连接
10341034
_, err := initDatabase()
10351035
if err != nil {
10361036
return nil, fmt.Errorf("failed to initialize database connection: %w", err)
10371037
}
10381038

1039-
// 生成实例ID
1040-
instanceID, err := GenerateInstanceID(serviceName)
1041-
if err != nil {
1042-
return nil, fmt.Errorf("failed to generate instance ID: %w", err)
1043-
}
1044-
10451039
// 创建实例记录
10461040
instance := &model.Instance{
1047-
ID: instanceID, // 设置实例ID
1041+
ID: instanceID, // 使用传入的实例ID
10481042
ServiceName: serviceName,
10491043
ServiceVersion: serviceVersion,
10501044
HostID: hostID,

0 commit comments

Comments
 (0)