Skip to content

Commit 0fbc5e8

Browse files
committed
Fix build error
1 parent 546c07b commit 0fbc5e8

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

common/scala/src/main/scala/org/apache/openwhisk/core/containerpool/AkkaContainerClient.scala

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ object AkkaContainerClient {
213213
as: ActorSystem,
214214
ec: ExecutionContext,
215215
tid: TransactionId): (Int, Option[JsArray]) = {
216-
val connection = new AkkaContainerClient(host, port, timeout, 1.MB, 1.MB, 1)
216+
val connection = new AkkaContainerClient(host, port, timeout, 1)
217217
val response = executeRequestForJsArray(connection, endPoint, content)
218218
val result = Await.result(response, timeout + 10.seconds) //additional timeout to complete futures
219219
connection.close()
@@ -265,7 +265,12 @@ object AkkaContainerClient {
265265
tid: TransactionId): Future[(Int, Option[JsArray])] = {
266266

267267
val res = connection
268-
.post(endpoint, content, true)
268+
.post(
269+
endpoint,
270+
content,
271+
ActivationEntityLimit.MAX_ACTIVATION_ENTITY_LIMIT,
272+
ActivationEntityLimit.MAX_ACTIVATION_ENTITY_TRUNCATION_LIMIT,
273+
retry = true)
269274
.map({
270275
case Right(r) => (r.statusCode, Try(r.entity.parseJson.convertTo[JsArray]).toOption)
271276
case Left(NoResponseReceived()) => throw new IllegalStateException("no response from container")

core/invoker/src/main/scala/org/apache/openwhisk/core/invoker/ContainerMessageConsumer.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ class ContainerMessageConsumer(
9090
Messages.actionMismatchWhileInvoking
9191
case e: Throwable =>
9292
logging.error(
93-
this,
94-
s"An unknown DB error occurred while fetching action ${creation.invocationNamespace}/${creation.action} for creation ${creation.creationId}, error: $e.")
93+
this,
94+
s"An unknown DB error occurred while fetching action ${creation.invocationNamespace}/${creation.action} for creation ${creation.creationId}, error: $e.")
9595
Messages.actionFetchErrorWhileInvoking
9696
}
9797
logging.error(

0 commit comments

Comments
 (0)