fix memory padding when requests and limits are equal

streamnative · Sep 20, 2023 · 9703fe3 · 9703fe3
1 parent 7a441b6
commit 9703fe3
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
@@ -1851,6 +1851,15 @@ func getPythonSecretProviderArgs(secretMaps map[string]v1alpha1.SecretRef) []str
 	return ret
 }
 
+func calcInstanceMemoryResources(resources corev1.ResourceRequirements) string {
+	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 getDecimalSIMemory(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 getDecimalSIMemory(resources.Requests.Memory())
+}
+
 // Java command requires memory values in resource.DecimalSI format
 func getDecimalSIMemory(quantity *resource.Quantity) string {
 	if quantity.Format == resource.DecimalSI {

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

diff --git a/controllers/spec/sink.go b/controllers/spec/sink.go
@@ -212,7 +212,7 @@ func MakeSinkCommand(sink *v1alpha1.Sink) []string {
 		generateJavaLogConfigCommand(spec.Java, spec.LogTopicAgent),
 		parseJavaLogLevel(spec.Java),
 		generateSinkDetailsInJSON(sink),
-		getDecimalSIMemory(spec.Resources.Requests.Memory()), spec.Java.ExtraDependenciesDir, string(sink.UID),
+		calcInstanceMemoryResources(spec.Resources), spec.Java.ExtraDependenciesDir, string(sink.UID),
 		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
@@ -159,7 +159,7 @@ func makeSourceCommand(source *v1alpha1.Source) []string {
 		generateJavaLogConfigCommand(spec.Java, spec.LogTopicAgent),
 		parseJavaLogLevel(spec.Java),
 		generateSourceDetailsInJSON(source),
-		getDecimalSIMemory(spec.Resources.Requests.Memory()), spec.Java.ExtraDependenciesDir, string(source.UID),
+		calcInstanceMemoryResources(spec.Resources), spec.Java.ExtraDependenciesDir, string(source.UID),
 		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))