Skip to content

Commit 7c79078

Browse files
finish/failed uncompleted transaction
1 parent eacbe1a commit 7c79078

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

common/scala/src/main/scala/org/apache/openwhisk/core/database/elasticsearch/ElasticSearchActivationStore.scala

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,22 @@ class ElasticSearchActivationStore(
142142
.map { res =>
143143
if (res.status == StatusCodes.OK.intValue || res.status == StatusCodes.Created.intValue) {
144144
res.result.items.map { bulkRes =>
145-
if (bulkRes.status == StatusCodes.OK.intValue || bulkRes.status == StatusCodes.Created.intValue)
145+
if (bulkRes.status == StatusCodes.OK.intValue || bulkRes.status == StatusCodes.Created.intValue) {
146+
transid
147+
.finished(
148+
this,
149+
start,
150+
s"[PUT] 'activations' completed document: '${bulkRes.id}', response: '${DocInfo(bulkRes.id)}'")
146151
Right(DocInfo(bulkRes.id))
147-
else
152+
} else {
153+
transid.failed(
154+
this,
155+
start,
156+
s"'activations' failed to put documents, http status: '${bulkRes.status}'",
157+
ErrorLevel)
148158
Left(PutException(
149159
s"Unexpected error: ${bulkRes.error.map(e => s"${e.`type`}:${e.reason}").getOrElse("unknown")}, code: ${bulkRes.status} on 'bulk_put'"))
160+
}
150161
}
151162
} else {
152163
transid.failed(
@@ -193,7 +204,10 @@ class ElasticSearchActivationStore(
193204
throw GetException("Unexpected http response code: " + res.status)
194205
}
195206
} recoverWith {
196-
case _: DeserializationException => throw DocumentUnreadable(Messages.corruptedEntity)
207+
case _: DeserializationException =>
208+
transid
209+
.finished(this, start, s"[GET] 'activations' failed to get document: '$activationId'; failed to deserialize")
210+
throw DocumentUnreadable(Messages.corruptedEntity)
197211
}
198212

199213
reportFailure(

0 commit comments

Comments
 (0)