Supports backwards compatibility for new limit config

Author: upgle

common/scala/src/main/resources/application.conf

@@ -511,32 +511,33 @@ whisk {
         default-list-limit = 30   # default limit on number of entities returned from a collection on a list operation
     }
 
-    # default namespace limit that users can set themselves
-    namespace-default-limit {
-        memory {
-            min = 128 m
-            max = 512 m
-        }
-        time-limit {
-            min = 100 ms
-            max = 5 m
-        }
-        log-limit {
-            min = 0 m
-            max = 10 m
-        }
-        concurrency-limit {
-            min = 1
-            max = 1
-        }
-        parameter-size-limit = 1 m
-        activation {
-            payload {
-                max = 1 m
-                truncation = 1 m
-            }
-        }
-    }
+    # default namespace limit settings
+    # Disabled for backwards compatibility. If you want to use it, either uncomment it or add the setting at deployment time.
+    # namespace-default-limit {
+    #     memory {
+    #         min = 128 m
+    #         max = 512 m
+    #     }
+    #     time-limit {
+    #         min = 100 ms
+    #         max = 5 m
+    #     }
+    #     log-limit {
+    #         min = 0 m
+    #         max = 10 m
+    #     }
+    #     concurrency-limit {
+    #         min = 1
+    #         max = 1
+    #     }
+    #     parameter-size-limit = 1 m
+    #     activation {
+    #         payload {
+    #             max = 1 m
+    #             truncation = 1 m
+    #         }
+    #     }
+    # }
 
     yarn {
         master-url="http://localhost:8088" //YARN Resource Manager endpoint to be accessed from the invoker

common/scala/src/main/scala/org/apache/openwhisk/core/entity/ActivationEntityLimit.scala

@@ -32,8 +32,13 @@ case class ActivationEntityLimitConf(serdesOverhead: ByteSize, payload: Activati
  */
 protected[core] object ActivationEntityLimit {
   private val config = loadConfigOrThrow[ActivationEntityLimitConf](ConfigKeys.activation)
-  private val namespacePayloadLimitConfig =
+  private val namespacePayloadLimitConfig = try {
     loadConfigOrThrow[ActivationEntityPayload](ConfigKeys.namespaceActivationPayloadLimit)
+  } catch {
+    case _: Throwable =>
+      // Supports backwards compatibility for openwhisk that do not use the namespace default limit
+      ActivationEntityPayload(config.payload.max, config.payload.truncation)
+  }
 
   // system limit
   protected[core] val MAX_ACTIVATION_ENTITY_LIMIT: ByteSize = config.payload.max

common/scala/src/main/scala/org/apache/openwhisk/core/entity/ConcurrencyLimit.scala

@@ -65,8 +65,13 @@ protected[core] object ConcurrencyLimit extends ArgNormalizer[ConcurrencyLimit]
   val config = ConfigFactory.load().getConfig("test")
   private val concurrencyConfig =
     loadConfigWithFallbackOrThrow[ConcurrencyLimitConfig](config, ConfigKeys.concurrencyLimit)
-  private val namespaceConcurrencyDefaultConfig =
+  private val namespaceConcurrencyDefaultConfig = try {
     loadConfigWithFallbackOrThrow[NamespaceConcurrencyLimitConfig](config, ConfigKeys.namespaceConcurrencyLimit)
+  } catch {
+    case _: Throwable =>
+      // Supports backwards compatibility for openwhisk that do not use the namespace default limit
+      NamespaceConcurrencyLimitConfig(concurrencyConfig.min, concurrencyConfig.max)
+  }
 
   /**
    * These system limits and namespace default limits are set once at the beginning.

common/scala/src/main/scala/org/apache/openwhisk/core/entity/LogLimit.scala

@@ -68,7 +68,13 @@ protected[core] class LogLimit private (val megabytes: Int) extends AnyVal {
 
 protected[core] object LogLimit extends ArgNormalizer[LogLimit] {
   val config = loadConfigOrThrow[MemoryLimitConfig](ConfigKeys.logLimit)
-  val namespaceDefaultConfig = loadConfigOrThrow[NamespaceMemoryLimitConfig](ConfigKeys.namespaceLogLimit)
+  val namespaceDefaultConfig = try {
+    loadConfigOrThrow[NamespaceMemoryLimitConfig](ConfigKeys.namespaceLogLimit)
+  } catch {
+    case _: Throwable =>
+      // Supports backwards compatibility for openwhisk that do not use the namespace default limit
+      NamespaceMemoryLimitConfig(config.min, config.max)
+  }
   val logLimitFieldName = "log"
 
   /**

common/scala/src/main/scala/org/apache/openwhisk/core/entity/MemoryLimit.scala

@@ -65,7 +65,13 @@ protected[entity] class MemoryLimit private (val megabytes: Int) extends AnyVal
 
 protected[core] object MemoryLimit extends ArgNormalizer[MemoryLimit] {
   val config = loadConfigOrThrow[MemoryLimitConfig](ConfigKeys.memory)
-  val namespaceDefaultConfig = loadConfigOrThrow[NamespaceMemoryLimitConfig](ConfigKeys.namespaceMemoryLimit)
+  val namespaceDefaultConfig = try {
+    loadConfigOrThrow[NamespaceMemoryLimitConfig](ConfigKeys.namespaceMemoryLimit)
+  } catch {
+    case _: Throwable =>
+      // Supports backwards compatibility for openwhisk that do not use the namespace default limit
+      NamespaceMemoryLimitConfig(config.min, config.max)
+  }
   val memoryLimitFieldName = "memory"
 
   /**

common/scala/src/main/scala/org/apache/openwhisk/core/entity/Parameter.scala

@@ -217,7 +217,13 @@ protected[entity] case class ParameterValue protected[entity] (private val v: Js
 protected[core] object Parameters extends ArgNormalizer[Parameters] {
 
   protected[core] val MAX_SIZE = loadConfigOrThrow[ByteSize](ConfigKeys.parameterSizeLimit) // system limit
-  protected[core] val MAX_SIZE_DEFAULT = loadConfigOrThrow[ByteSize](ConfigKeys.namespaceParameterSizeLimit) // namespace default limit
+  protected[core] val MAX_SIZE_DEFAULT = try {
+    loadConfigOrThrow[ByteSize](ConfigKeys.namespaceParameterSizeLimit)
+  } catch {
+    case _: Throwable =>
+      // Supports backwards compatibility for openwhisk that do not use the namespace default limit
+      MAX_SIZE
+  }
 
   require(MAX_SIZE >= MAX_SIZE_DEFAULT, "The system limit must be greater than the namespace limit.")
 

common/scala/src/main/scala/org/apache/openwhisk/core/entity/TimeLimit.scala

@@ -68,7 +68,13 @@ case class TimeLimitConfig(max: FiniteDuration, min: FiniteDuration, std: Finite
 
 protected[core] object TimeLimit extends ArgNormalizer[TimeLimit] {
   val config = loadConfigOrThrow[TimeLimitConfig](ConfigKeys.timeLimit)
-  val namespaceDefaultConfig = loadConfigOrThrow[NamespaceTimeLimitConfig](ConfigKeys.namespaceTimeLimit)
+  val namespaceDefaultConfig = try {
+    loadConfigOrThrow[NamespaceTimeLimitConfig](ConfigKeys.namespaceTimeLimit)
+  } catch {
+    case _: Throwable =>
+      // Supports backwards compatibility for openwhisk that do not use the namespace default limit
+      NamespaceTimeLimitConfig(config.max, config.min)
+  }
   val timeLimitFieldName = "duration"
 
   /**

core/controller/src/main/scala/org/apache/openwhisk/core/controller/Controller.scala

@@ -215,6 +215,12 @@ object Controller {
         "triggers_per_minute" -> config.triggerFirePerMinuteLimit.toInt.toJson,
         "concurrent_actions" -> config.actionInvokeConcurrentLimit.toInt.toJson,
         "sequence_length" -> config.actionSequenceLimit.toInt.toJson,
+        "default_min_action_duration" -> TimeLimit.namespaceDefaultConfig.min.toMillis.toJson,
+        "default_max_action_duration" -> TimeLimit.namespaceDefaultConfig.max.toMillis.toJson,
+        "default_min_action_memory" -> MemoryLimit.namespaceDefaultConfig.min.toBytes.toJson,
+        "default_max_action_memory" -> MemoryLimit.namespaceDefaultConfig.max.toBytes.toJson,
+        "default_min_action_logs" -> LogLimit.namespaceDefaultConfig.min.toBytes.toJson,
+        "default_max_action_logs" -> LogLimit.namespaceDefaultConfig.max.toBytes.toJson,
         "min_action_duration" -> timeLimit.min.toMillis.toJson,
         "max_action_duration" -> timeLimit.max.toMillis.toJson,
         "min_action_memory" -> memLimit.min.toBytes.toJson,

tests/src/test/scala/org/apache/openwhisk/core/controller/test/ControllerApiTests.scala

@@ -57,6 +57,12 @@ class ControllerApiTests extends FlatSpec with RestUtil with Matchers with Strea
         "triggers_per_minute" -> config.triggerFirePerMinuteLimit.toInt.toJson,
         "concurrent_actions" -> config.actionInvokeConcurrentLimit.toInt.toJson,
         "sequence_length" -> config.actionSequenceLimit.toInt.toJson,
+        "default_min_action_duration" -> TimeLimit.namespaceDefaultConfig.min.toMillis.toJson,
+        "default_max_action_duration" -> TimeLimit.namespaceDefaultConfig.max.toMillis.toJson,
+        "default_min_action_memory" -> MemoryLimit.namespaceDefaultConfig.min.toBytes.toJson,
+        "default_max_action_memory" -> MemoryLimit.namespaceDefaultConfig.max.toBytes.toJson,
+        "default_min_action_logs" -> LogLimit.namespaceDefaultConfig.min.toBytes.toJson,
+        "default_max_action_logs" -> LogLimit.namespaceDefaultConfig.max.toBytes.toJson,
         "min_action_duration" -> TimeLimit.config.min.toMillis.toJson,
         "max_action_duration" -> TimeLimit.config.max.toMillis.toJson,
         "min_action_memory" -> MemoryLimit.config.min.toBytes.toJson,