Change prewarm container

- Add prewarm container
- Delete prewarm container
- Add test case

Author: ningyougang

ansible/group_vars/all

@@ -88,6 +88,8 @@ controller:
   authentication:
     spi: "{{ controller_authentication_spi | default('') }}"
   loglevel: "{{ controller_loglevel | default(whisk_loglevel) | default('INFO') }}"
+  username: "{{ controller_username | default(operation.username) }}"
+  password: "{{ controller_password | default(operation.password) }}"
   entitlement:
     spi: "{{ controller_entitlement_spi | default('') }}"
   protocol: "{{ controller_protocol | default('https') }}"
@@ -183,6 +185,8 @@ invoker:
   docker:
     become: "{{ invoker_docker_become | default(false) }}"
   loglevel: "{{ invoker_loglevel | default(whisk_loglevel) | default('INFO') }}"
+  username: "{{ invoker_username | default(operation.username) }}"
+  password: "{{ invoker_password | default(operation.password) }}"
   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) }}
@@ -379,3 +383,8 @@ metrics:
     port: "{{ metrics_kamon_statsd_port | default('8125') }}"
 
 user_events: "{{ user_events_enabled | default(false) }}"
+
+# Operation configuation
+operation:
+    username: "{{ operation_username | default('admin') }}"
+    password: "{{ operation_password | default('admin') }}"

ansible/roles/controller/tasks/deploy.yml

@@ -57,6 +57,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

@@ -159,6 +159,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/scala/org/apache/openwhisk/core/connector/Message.scala

@@ -282,3 +282,12 @@ object EventMessage extends DefaultJsonProtocol {
 
   def parse(msg: String) = format.read(msg.parseJson)
 }
+
+case class RuntimeMessage(runtime: String, operType: 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", "operType")
+}

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

@@ -53,6 +53,14 @@ protected[core] object ExecManifest {
     mf
   }
 
+  protected[core] def initializePrewarm(prewarmRuntime: String): Try[Runtimes] = {
+    val rmc = loadConfigOrThrow[RuntimeManifestConfig](ConfigKeys.runtimes)
+    val mf = Try(prewarmRuntime.parseJson.asJsObject).flatMap(runtimes(_, rmc))
+    var manifest: Option[Runtimes] = None
+    mf.foreach(m => manifest = Some(m))
+    mf
+  }
+
   /**
    * Gets existing runtime manifests.
    *

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

@@ -21,7 +21,8 @@ import akka.Done
 import akka.actor.{ActorSystem, CoordinatedShutdown}
 import akka.event.Logging.InfoLevel
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
-import akka.http.scaladsl.model.Uri
+import akka.http.scaladsl.model.{StatusCodes, Uri}
+import akka.http.scaladsl.model.headers.BasicHttpCredentials
 import akka.http.scaladsl.server.Route
 import akka.stream.ActorMaterializer
 import kamon.Kamon
@@ -78,6 +79,17 @@ class Controller(val instance: ControllerInstanceId,
                  implicit val logging: Logging)
     extends BasicRasService {
 
+  val controllerUsername = {
+    val source = scala.io.Source.fromFile("/conf/controllerauth.username");
+    try source.mkString.replaceAll("\r|\n", "")
+    finally source.close()
+  }
+  val controllerPassword = {
+    val source = scala.io.Source.fromFile("/conf/controllerauth.password");
+    try source.mkString.replaceAll("\r|\n", "")
+    finally source.close()
+  }
+
   TransactionId.controller.mark(
     this,
     LoggingMarkers.CONTROLLER_STARTUP(instance.asString),
@@ -95,7 +107,7 @@ class Controller(val instance: ControllerInstanceId,
       (pathEndOrSingleSlash & get) {
         complete(info)
       }
-    } ~ apiV1.routes ~ swagger.swaggerRoutes ~ internalInvokerHealth
+    } ~ apiV1.routes ~ swagger.swaggerRoutes ~ internalInvokerHealth ~ changeRuntime
   }
 
   // initialize datastores
@@ -154,6 +166,38 @@ class Controller(val instance: ControllerInstanceId,
     }
   }
 
+  /**
+   * Handles POST/DELETE prewarm container
+   */
+  private val changeRuntime = {
+    implicit val executionContext = actorSystem.dispatcher
+    (path("prewarmContainer") & (post | delete)) {
+      extractCredentials {
+        case Some(BasicHttpCredentials(username, password)) =>
+          if (username == controllerUsername && password == controllerPassword) {
+            extractMethod { method =>
+              entity(as[String]) { prewarmRuntime =>
+                val execManifest = ExecManifest.initializePrewarm(prewarmRuntime)
+                if (execManifest.isFailure) {
+                  logging.error(
+                    this,
+                    s"Received invalid prewarm runtimes manifest with ${method.name} request:${execManifest.failed.get}")
+                  complete(s"Received invalid prewarm runtimes manifest with ${method.name} request")
+                } else {
+                  logging.info(this, s"Received valid prewarm runtimes manifest with ${method.name} request")
+                  loadBalancer.sendRuntimeToManageInvoker(prewarmRuntime, method.name)
+                  complete(s"Change prewarm container request with ${method.name} is already sent to managed invokers")
+                }
+              }
+            }
+          } else {
+            complete("username or password is wrong")
+          }
+        case _ => complete(StatusCodes.Unauthorized)
+      }
+    }
+  }
+
   // controller top level info
   private val info = Controller.info(
     whiskConfig,