Config runtime

Sometimes, admin may want to reinitalize the runtime config depend on
the real requirements, e.g. increase some prewarm containers

Author: ningyougang

ansible/group_vars/all

@@ -105,6 +105,8 @@ controller:
   authentication:
     spi: "{{ controller_authentication_spi | default('') }}"
   loglevel: "{{ controller_loglevel | default(whisk_loglevel) | default('INFO') }}"
+  username: "{{ controller_username | default('controller.user') }}"
+  password: "{{ controller_password | default('controller.pass') }}"
   entitlement:
     spi: "{{ controller_entitlement_spi | default('') }}"
   protocol: "{{ controller_protocol | default('https') }}"
@@ -200,6 +202,8 @@ invoker:
     become: "{{ invoker_docker_become | default(false) }}"
     runcdir: "{{ invoker_runcdir | default('/run/docker/runtime-runc/moby') }}"
   loglevel: "{{ invoker_loglevel | default(whisk_loglevel) | default('INFO') }}"
+  username: "{{ invoker_username | default('invoker.user') }}"
+  password: "{{ invoker_password | default('invoker.pass') }}"
   jmxremote:
     jvmArgs: "{% if inventory_hostname in groups['invokers'] %}
     {{ jmx.jvmCommonArgs }} -Djava.rmi.server.hostname={{ invokerHostname }} -Dcom.sun.management.jmxremote.rmi.port={{ jmx.rmiBasePortInvoker + groups['invokers'].index(inventory_hostname) }} -Dcom.sun.management.jmxremote.port={{ jmx.basePortInvoker + groups['invokers'].index(inventory_hostname) }}

ansible/roles/controller/tasks/deploy.yml

@@ -71,6 +71,18 @@
     dest: "{{ controller.confdir }}/{{ controller_name }}/jmxremote.access"
     mode: 0777
 
+- name: copy controller auth username file
+  template:
+    src: "controllerauth.username.j2"
+    dest: "{{ controller.confdir  }}/{{ controller_name }}/controllerauth.username"
+    mode: 0777
+
+- name: copy controller auth password file
+  template:
+    src: "controllerauth.password.j2"
+    dest: "{{ controller.confdir  }}/{{ controller_name }}/controllerauth.password"
+    mode: 0777
+
 - name: "copy kafka truststore/keystore"
   when: kafka.protocol == 'SSL'
   copy:

ansible/roles/invoker/tasks/deploy.yml

@@ -183,6 +183,18 @@
     dest: "{{ invoker.confdir  }}/{{ invoker_name }}/jmxremote.access"
     mode: 0777
 
+- name: copy invoker auth username file
+  template:
+    src: "invokerauth.username.j2"
+    dest: "{{ invoker.confdir  }}/invoker{{ groups['invokers'].index(inventory_hostname) }}/invokerauth.username"
+    mode: 0777
+
+- name: copy invoker auth password file
+  template:
+    src: "invokerauth.password.j2"
+    dest: "{{ invoker.confdir  }}/invoker{{ groups['invokers'].index(inventory_hostname) }}/invokerauth.password"
+    mode: 0777
+
 - name: add additional jvm params if jmxremote is enabled
   when: jmx.enabled
   set_fact:

ansible/templates/controllerauth.password.j2

@@ -0,0 +1 @@
+{{ controller.password }}

ansible/templates/controllerauth.username.j2

@@ -0,0 +1 @@
+{{ controller.username }}

ansible/templates/invokerauth.password.j2

@@ -0,0 +1 @@
+{{ invoker.password }}

ansible/templates/invokerauth.username.j2

@@ -0,0 +1 @@
+{{ invoker.username }}

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

@@ -27,7 +27,7 @@ whisk.spi {
   EntitlementSpiProvider = org.apache.openwhisk.core.entitlement.LocalEntitlementProvider
   AuthenticationDirectiveProvider = org.apache.openwhisk.core.controller.BasicAuthenticationDirective
   InvokerProvider = org.apache.openwhisk.core.invoker.InvokerReactive
-  InvokerServerProvider = org.apache.openwhisk.core.invoker.DefaultInvokerServer
+  InvokerServerProvider = org.apache.openwhisk.core.invoker.InvokerServer
 }
 
 dispatchers {

common/scala/src/main/scala/org/apache/openwhisk/core/connector/Message.scala

@@ -405,3 +405,30 @@ object EventMessage extends DefaultJsonProtocol {
 
   def parse(msg: String) = Try(format.read(msg.parseJson))
 }
+
+case class RuntimeMessage(runtime: String) extends Message {
+  override def serialize = RuntimeMessage.serdes.write(this).compactPrint
+}
+
+object RuntimeMessage extends DefaultJsonProtocol {
+  def parse(msg: String) = Try(serdes.read(msg.parseJson))
+  implicit val serdes = jsonFormat(RuntimeMessage.apply _, "runtime")
+}
+
+case class PrewarmContainerData(kind: String, memory: Long, var number: Int) extends Message {
+  override def serialize: String = PrewarmContainerData.serdes.write(this).compactPrint
+}
+
+object PrewarmContainerData extends DefaultJsonProtocol {
+  implicit val serdes = jsonFormat(PrewarmContainerData.apply _, "kind", "memory", "number")
+}
+
+case class PrewarmContainerDataList(items: List[PrewarmContainerData])
+
+object PrewarmContainerDataProtocol extends DefaultJsonProtocol {
+  implicit val prewarmContainerDataFormat = jsonFormat(PrewarmContainerData.apply _, "kind", "memory", "number")
+  implicit object prewarmContainerDataListJsonFormat extends RootJsonFormat[PrewarmContainerDataList] {
+    def read(value: JsValue) = PrewarmContainerDataList(value.convertTo[List[PrewarmContainerData]])
+    def write(f: PrewarmContainerDataList) = ???
+  }
+}

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

@@ -55,6 +55,20 @@ protected[core] object ExecManifest {
     mf
   }
 
+  /**
+   * Reads runtimes manifest from runtime string
+   *
+   * @param runtime
+   * @return the manifest if initialized successfully, or an failure
+   */
+  protected[core] def initialize(runtime: String): Try[Runtimes] = {
+    val rmc = loadConfigOrThrow[RuntimeManifestConfig](ConfigKeys.runtimes)
+    val mf = Try(runtime.parseJson.asJsObject).flatMap(runtimes(_, rmc))
+    var manifest: Option[Runtimes] = None
+    mf.foreach(m => manifest = Some(m))
+    mf
+  }
+
   /**
    * Gets existing runtime manifests.
    *