feat: add env params to control database execute/close timeout.

fireboomio · Jan 15, 2025 · b3c5348 · b3c5348
1 parent be0e754
commit b3c5348
Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/pkg/common/consts/env_param.go b/pkg/common/consts/env_param.go
@@ -65,3 +65,8 @@ const (
 	HookReportTime   = "hookReportTime"
 	HookReportStatus = "hookReportStatus"
 )
+
+const (
+	DatabaseExecuteTimeout = "FB_DATABASE_EXECUTE_TIMEOUT"
+	DatabaseCloseTimeout   = "FB_DATABASE_CLOSE_TIMEOUT"
+)
diff --git a/pkg/common/utils/viper_lock.go b/pkg/common/utils/viper_lock.go
@@ -42,3 +42,11 @@ func GetTimeWithLockViper(key string) time.Time {
 
 	return viper.GetTime(key)
 }
+
+// GetInt32WithLockViper 带锁获取viper中的int32值
+func GetInt32WithLockViper(key string) int32 {
+	viperMutex.Lock()
+	defer viperMutex.Unlock()
+
+	return viper.GetInt32(key)
+}
diff --git a/pkg/engine/datasource/prisma.go b/pkg/engine/datasource/prisma.go
@@ -74,6 +74,8 @@ func buildRuntimeDataSourceConfigurationForPrisma(prismaSchema string, config *w
 	staticData := &wgpb.DataSourceCustom_Static{Data: &wgpb.ConfigurationVariable{}}
 	customDatabase := *config.CustomDatabase
 	customDatabase.PrismaSchema, _ = filepath.Abs(prismaSchema)
+	customDatabase.ExecuteTimeoutSeconds = utils.GetInt32WithLockViper(consts.DatabaseExecuteTimeout)
+	customDatabase.CloseTimeoutSeconds = utils.GetInt32WithLockViper(consts.DatabaseCloseTimeout)
 	configs, fields = copyDatasourceWithRootNodes(config, func(_ *wgpb.TypeField, configItem *wgpb.DataSourceConfiguration) bool {
 		configItem.CustomDatabase = &customDatabase
 		configItem.CustomStatic = staticData

diff --git a/wundergraphGitSubmodule b/wundergraphGitSubmodule
+29 −16		pkg/datasources/database/datasource.go
+3 −0		pkg/engineconfigloader/engineconfigloader.go
+609 −598		pkg/wgpb/wundernode_config.pb.go
+1 −0		types/protos/wundernode_config.proto