Update based on comments

Author: jiangpengcheng

ansible/README.md

@@ -198,7 +198,7 @@ ansible-playbook -i environments/$ENVIRONMENT routemgmt.yml
 
 ### Deploying Using MongoDB
 
-You can choose MongoDB instead of CouchDB as the database backend to store entities and activations.
+You can choose MongoDB instead of CouchDB as the database backend to store entities.
 
 - Deploy a mongodb server(Optional, for test and develop only, use an external MongoDB server in production)
 

ansible/group_vars/all

@@ -329,10 +329,6 @@ elasticsearch_connect_string: "{% set ret = [] %}\
                                {{ ret | join(',') }}"
 mongodb:
   version: 4.4.0
-  commonEnv:
-    CONFIG_whisk_mongodb_uri: "{{ db.mongodb.connect_string }}"
-    CONFIG_whisk_mongodb_database: "{{ db.mongodb.database }}"
-    CONFIG_whisk_spi_ArtifactStoreProvider: "org.apache.openwhisk.core.database.mongodb.MongoDBArtifactStoreProvider"
 
 docker:
   # The user to install docker for. Defaults to the ansible user if not set. This will be the user who is able to run

ansible/roles/controller/tasks/deploy.yml

@@ -292,9 +292,17 @@
     env: "{{ env | combine(elastic_env) }}"
   when: db.activation_store.backend == "ElasticSearch"
 
-- name: merge mongodb env variables
+- name: setup mongodb artifact store env
   set_fact:
-    env: "{{ env | combine(mongodb.commonEnv) }}"
+    mongodb_env:
+      "CONFIG_whisk_mongodb_uri": "{{ db.mongodb.connect_string }}"
+      "CONFIG_whisk_mongodb_database": "{{ db.mongodb.database }}"
+      "CONFIG_whisk_spi_ArtifactStoreProvider": "org.apache.openwhisk.core.database.mongodb.MongoDBArtifactStoreProvider"
+  when: db.backend == "MongoDB"
+
+- name: merge mongodb artifact store env
+  set_fact:
+    env: "{{ env | combine(mongodb_env) }}"
   when: db.backend == "MongoDB"
 
 - name: populate volumes for controller

ansible/roles/invoker/tasks/deploy.yml

@@ -307,9 +307,17 @@
     env: "{{ env | combine(elastic_env) }}"
   when: db.activation_store.backend == "ElasticSearch"
 
-- name: merge mongodb env variables
+- name: setup mongodb artifact store env
   set_fact:
-    env: "{{ env | combine(mongodb.commonEnv) }}"
+    mongodb_env:
+      "CONFIG_whisk_mongodb_uri": "{{ db.mongodb.connect_string }}"
+      "CONFIG_whisk_mongodb_database": "{{ db.mongodb.database }}"
+      "CONFIG_whisk_spi_ArtifactStoreProvider": "org.apache.openwhisk.core.database.mongodb.MongoDBArtifactStoreProvider"
+  when: db.backend == "MongoDB"
+
+- name: merge mongodb artifact store env
+  set_fact:
+    env: "{{ env | combine(mongodb_env) }}"
   when: db.backend == "MongoDB"
 
 - name: include plugins

ansible/roles/mongodb/tasks/clean.yml

@@ -22,8 +22,3 @@
     name: mongodb
     state: absent
     keep_volumes: False
-
-- name: remove MongoDB data volume
-  docker_volume:
-    name: "{{ db.mongodb.data_volume }}"
-    state: absent

common/scala/src/main/scala/org/apache/openwhisk/core/database/mongodb/MongoDBArtifactStore.scala

@@ -17,8 +17,6 @@
 
 package org.apache.openwhisk.core.database.mongodb
 
-import java.security.MessageDigest
-
 import akka.actor.ActorSystem
 import akka.event.Logging.ErrorLevel
 import akka.http.scaladsl.model._
@@ -81,7 +79,7 @@ class MongoDBArtifactStore[DocumentAbstraction <: DocumentSerializer](client: Mo
   val attachmentScheme: String = attachmentStore.map(_.scheme).getOrElse(mongodbScheme)
 
   private val database = client.getDatabase(dbName)
-  private val collection = getCollectionAndCreateIndexes
+  private val collection = getCollectionAndCreateIndexes()
   private val gridFSBucket = GridFSBucket(database, collName)
 
   private val jsonWriteSettings = JsonWriterSettings.builder().outputMode(JsonMode.RELAXED).build
@@ -129,6 +127,7 @@ class MongoDBArtifactStore[DocumentAbstraction <: DocumentSerializer](client: Mo
           DocInfo(DocId(id), DocRevision(rev))
         }
         .recover {
+          //  E11000 means a duplicate key error
           case t: MongoException if t.getCode == 11000 =>
             transid.finished(this, start, s"[PUT] '$dbName', document: '$docinfoStr'; conflict.")
             throw DocumentConflictException("conflict on 'put'")
@@ -570,8 +569,9 @@ class MongoDBArtifactStore[DocumentAbstraction <: DocumentSerializer](client: Mo
 
   // calculate the revision manually, to be compatible with couchdb's _rev field
   private def revisionCalculate(doc: JsObject): (String, String) = {
-    val md: MessageDigest = MessageDigest.getInstance("MD5")
-    val new_rev = md.digest(doc.toString.getBytes()).map(0xFF & _).map { "%02x".format(_) }.foldLeft("") { _ + _ }
+    val md = StoreUtils.emptyDigest()
+    val new_rev =
+      md.digest(doc.toString.getBytes()).map(0xFF & _).map { "%02x".format(_) }.foldLeft("") { _ + _ }.take(32)
     doc.fields
       .get("_rev")
       .map { value =>
@@ -615,7 +615,7 @@ class MongoDBArtifactStore[DocumentAbstraction <: DocumentSerializer](client: Mo
       .getOrElse(name)
   }
 
-  private def getCollectionAndCreateIndexes: MongoCollection[Document] = {
+  private def getCollectionAndCreateIndexes(): MongoCollection[Document] = {
     val coll = database.getCollection(collName)
     // create indexes in specific collection if they do not exist
     coll.listIndexes().toFuture().map { idxes =>

common/scala/src/main/scala/org/apache/openwhisk/core/database/mongodb/MongoDBArtifactStoreProvider.scala

@@ -32,7 +32,7 @@ import spray.json.RootJsonFormat
 import scala.reflect.ClassTag
 
 case class MongoDBConfig(uri: String, database: String) {
-  assume(Set(database, uri).forall(_.nonEmpty), "At least one expected property is missing")
+  assume(Set(database, uri).forall(_.trim.nonEmpty), "At least one expected property is missing")
 
   def collectionFor[D](implicit tag: ClassTag[D]) = tag.runtimeClass.getSimpleName.toLowerCase
 }