This is an automated email from the ASF dual-hosted git repository.
markusthoemmes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 73079ee Shutdown attachmentStore after store close. (#3891)
73079ee is described below
commit 73079eea8d1b94f161cbf0db719618eb370afa96
Author: Chetan Mehrotra <chet...@apache.org>
AuthorDate: Mon Jul 23 19:15:08 2018 +0530
Shutdown attachmentStore after store close. (#3891)
---
.../scala/whisk/core/database/cosmosdb/CosmosDBArtifactStore.scala | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/common/scala/src/main/scala/whisk/core/database/cosmosdb/CosmosDBArtifactStore.scala
b/common/scala/src/main/scala/whisk/core/database/cosmosdb/CosmosDBArtifactStore.scala
index fac08f3..116995e 100644
---
a/common/scala/src/main/scala/whisk/core/database/cosmosdb/CosmosDBArtifactStore.scala
+++
b/common/scala/src/main/scala/whisk/core/database/cosmosdb/CosmosDBArtifactStore.scala
@@ -401,7 +401,10 @@ class CosmosDBArtifactStore[DocumentAbstraction <:
DocumentSerializer](protected
.map(as => as.deleteAttachments(doc.id))
.getOrElse(Future.successful(true)) // For CosmosDB it is expected that
the entire document is deleted.
- override def shutdown(): Unit = clientRef.close()
+ override def shutdown(): Unit = {
+ attachmentStore.foreach(_.shutdown())
+ clientRef.close()
+ }
private def isNotFound[A <: DocumentAbstraction](e: DocumentClientException)
=
e.getStatusCode == StatusCodes.NotFound.intValue
