memory requests and limits padding fix when requests = limits (#692)

* add helm-docs to bump script * fix memory padding when requests and limits are equal * Update common.go
streamnative · Oct 23, 2023 · da5a0c2 · da5a0c2
1 parent 606dc73
commit da5a0c2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/controllers/spec/common.go b/controllers/spec/common.go
@@ -1904,6 +1904,15 @@ func getPythonSecretProviderArgs(secretMaps map[string]v1alpha1.SecretRef) []str
 	return ret
 }
 
+func calcInstanceMemoryResources(resources corev1.ResourceRequirements) *resource.Quantity {
+	if resources.Requests.Memory() == resources.Limits.Memory() {
+		// if request and limit are the same, use the value * 0.9 as the instance (JVM) memory size, to prevent OOM
+		return resource.NewQuantity(int64(float64(resources.Requests.Memory().Value())*0.9), resource.DecimalSI)
+	}
+	// if request and limit are different, use the request value as the instance (JVM) memory size
+	return resources.Requests.Memory()
+}
+
 func getGenericSecretProviderArgs(secretMaps map[string]v1alpha1.SecretRef, language string) []string {
 	var ret []string
 	if len(secretMaps) > 0 {

diff --git a/controllers/spec/function.go b/controllers/spec/function.go
@@ -221,7 +221,7 @@ func makeFunctionCommand(function *v1alpha1.Function) []string {
 				generateFunctionDetailsInJSON(function),
 				spec.Java.ExtraDependenciesDir,
 				string(function.UID),
-				spec.Resources.Requests.Memory(),
+				calcInstanceMemoryResources(spec.Resources),
 				spec.Java.JavaOpts, hasPulsarctl, hasWget,
 				spec.Pulsar.AuthSecret != "", spec.Pulsar.TLSSecret != "",
 				spec.SecretsMap, spec.StateConfig, spec.Pulsar.TLSConfig,

diff --git a/controllers/spec/sink.go b/controllers/spec/sink.go
@@ -213,7 +213,7 @@ func MakeSinkCommand(sink *v1alpha1.Sink) []string {
 		parseJavaLogLevel(spec.Java),
 		generateSinkDetailsInJSON(sink),
 		spec.Java.ExtraDependenciesDir, string(sink.UID),
-		spec.Resources.Requests.Memory(),
+		calcInstanceMemoryResources(spec.Resources),
 		spec.Java.JavaOpts, hasPulsarctl, hasWget, spec.Pulsar.AuthSecret != "", spec.Pulsar.TLSSecret != "",
 		spec.SecretsMap, spec.StateConfig, spec.Pulsar.TLSConfig, spec.Pulsar.AuthConfig, nil,
 		generateJavaLogConfigFileName(spec.Java))

diff --git a/controllers/spec/source.go b/controllers/spec/source.go
@@ -160,7 +160,7 @@ func makeSourceCommand(source *v1alpha1.Source) []string {
 		parseJavaLogLevel(spec.Java),
 		generateSourceDetailsInJSON(source),
 		spec.Java.ExtraDependenciesDir, string(source.UID),
-		spec.Resources.Requests.Memory(),
+		calcInstanceMemoryResources(spec.Resources),
 		spec.Java.JavaOpts, hasPulsarctl, hasWget, spec.Pulsar.AuthSecret != "", spec.Pulsar.TLSSecret != "",
 		spec.SecretsMap, spec.StateConfig, spec.Pulsar.TLSConfig, spec.Pulsar.AuthConfig, nil,
 		generateJavaLogConfigFileName(spec.Java))