Skip to content

Commit a43bce2

Browse files
jgainerdewarjgainerdewar
authored
Revert "AN-522 Temporarily log messages received by PAPI job execution actors" (#7735)
1 parent 93050be commit a43bce2

File tree

5 files changed

+23
-49
lines changed

5 files changed

+23
-49
lines changed

‎backend/src/main/scala/cromwell/backend/async/AsyncBackendJobExecutionActor.scala

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package cromwell.backend.async
22

3-
import akka.actor.{Actor, ActorRef}
3+
import java.util.concurrent.ExecutionException
4+
5+
import akka.actor.{Actor, ActorLogging, ActorRef}
6+
import cromwell.backend.{BackendJobDescriptor, SlowJobWarning}
47
import cromwell.backend.BackendJobExecutionActor._
58
import cromwell.backend.async.AsyncBackendJobExecutionActor._
6-
import cromwell.backend.{BackendJobDescriptor, SlowJobWarning}
79
import cromwell.core.CromwellFatalExceptionMarker
8-
import cromwell.core.logging.JobLogging
910
import cromwell.core.retry.{Retry, SimpleExponentialBackoff}
1011
import cromwell.services.metadata.MetadataService.MetadataServiceResponse
1112

12-
import java.util.concurrent.ExecutionException
1313
import scala.concurrent.duration._
1414
import scala.concurrent.{ExecutionContext, Future, Promise}
1515
import scala.util.{Failure, Success}
@@ -41,7 +41,7 @@ object AsyncBackendJobExecutionActor {
4141
}
4242
}
4343

44-
trait AsyncBackendJobExecutionActor { this: Actor with JobLogging with SlowJobWarning =>
44+
trait AsyncBackendJobExecutionActor { this: Actor with ActorLogging with SlowJobWarning =>
4545

4646
def dockerImageUsed: Option[String]
4747

@@ -84,20 +84,14 @@ trait AsyncBackendJobExecutionActor { this: Actor with JobLogging with SlowJobWa
8484

8585
override def receive: Receive = slowJobWarningReceive orElse {
8686
case mode: ExecutionMode => robustExecuteOrRecover(mode)
87-
case IssuePollRequest(handle) =>
88-
jobLogger.info("AN-522 Received IssuePollRequest")
89-
robustPoll(handle)
90-
case PollResponseReceived(handle) if handle.isDone =>
91-
jobLogger.info("AN-522 Received PollResponseReceived with isDone=true")
92-
self ! Finish(handle)
87+
case IssuePollRequest(handle) => robustPoll(handle)
88+
case PollResponseReceived(handle) if handle.isDone => self ! Finish(handle)
9389
case PollResponseReceived(handle) =>
9490
// This should stash the Cancellable someplace so it can be cancelled once polling is complete.
9591
// -Ywarn-value-discard
96-
jobLogger.info("AN-522 Received PollResponseReceived with isDone=false")
9792
context.system.scheduler.scheduleOnce(pollBackOff.backoffMillis.millis, self, IssuePollRequest(handle))
9893
()
9994
case Finish(SuccessfulExecutionHandle(outputs, returnCode, jobDetritusFiles, executionEvents, _)) =>
100-
jobLogger.info("AN-522 Received Finish with SuccessfulExecutionHandle")
10195
completionPromise.success(
10296
JobSucceededResponse(jobDescriptor.key,
10397
Some(returnCode),
@@ -110,23 +104,16 @@ trait AsyncBackendJobExecutionActor { this: Actor with JobLogging with SlowJobWa
110104
)
111105
context.stop(self)
112106
case Finish(FailedNonRetryableExecutionHandle(throwable, returnCode, _)) =>
113-
jobLogger.info("AN-522 Received Finish with FailedNonRetryableExecutionHandle")
114107
completionPromise.success(JobFailedNonRetryableResponse(jobDescriptor.key, throwable, returnCode))
115108
context.stop(self)
116109
case Finish(FailedRetryableExecutionHandle(throwable, returnCode, _)) =>
117-
jobLogger.info("AN-522 Received Finish with FailedRetryableExecutionHandle")
118110
completionPromise.success(JobFailedRetryableResponse(jobDescriptor.key, throwable, returnCode))
119111
context.stop(self)
120112
case Finish(cromwell.backend.async.AbortedExecutionHandle) =>
121-
jobLogger.info("AN-522 Received Finish with AbortedExecutionHandle")
122113
completionPromise.success(JobAbortedResponse(jobDescriptor.key))
123114
context.stop(self)
124-
case FailAndStop(t) =>
125-
jobLogger.info("AN-522 Received FailAndStop")
126-
failAndStop(t)
127-
case response: MetadataServiceResponse =>
128-
jobLogger.info("AN-522 Received MetadataServiceResponse")
129-
handleMetadataServiceResponse(sender(), response)
115+
case FailAndStop(t) => failAndStop(t)
116+
case response: MetadataServiceResponse => handleMetadataServiceResponse(sender(), response)
130117
case badMessage => log.error(s"Unexpected message $badMessage.")
131118
}
132119

‎services/src/main/scala/cromwell/services/keyvalue/KvClient.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package cromwell.services.keyvalue
22

3-
import akka.actor.{Actor, ActorRef}
4-
import cromwell.core.logging.JobLogging
3+
import akka.actor.{Actor, ActorLogging, ActorRef}
54
import cromwell.services.keyvalue.KeyValueServiceActor._
65

76
import scala.concurrent.{ExecutionContext, Future, Promise}
87

9-
trait KvClient { this: Actor with JobLogging =>
8+
trait KvClient { this: Actor with ActorLogging =>
109

1110
def serviceRegistryActor: ActorRef
1211
private[keyvalue] var currentKvClientRequests: Map[ScopedKey, Promise[KvResponse]] = Map.empty
@@ -22,7 +21,6 @@ trait KvClient { this: Actor with JobLogging =>
2221
}
2322

2423
final def kvClientReceive: Actor.Receive = { case response: KvResponse =>
25-
jobLogger.info("AN-522 KvResponse")
2624
fulfillOrLog(response)
2725
}
2826

‎services/src/test/scala/cromwell/services/keyvalue/KvClientSpec.scala

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package cromwell.services.keyvalue
22

3-
import akka.actor.{Actor, ActorRef}
3+
import java.io.IOException
4+
5+
import akka.actor.{Actor, ActorLogging, ActorRef}
46
import akka.testkit.{TestActorRef, TestProbe}
5-
import cromwell.core.logging.JobLogging
6-
import cromwell.core.{PossiblyNotRootWorkflowId, RootWorkflowId, TestKitSuite}
7+
import cromwell.core.TestKitSuite
78
import cromwell.services.keyvalue.KeyValueServiceActor._
89
import org.scalatest.flatspec.AnyFlatSpecLike
910
import org.scalatest.matchers.should.Matchers
1011

11-
import java.io.IOException
12-
import java.util.UUID
13-
import scala.concurrent.duration._
1412
import scala.concurrent.{Await, ExecutionContextExecutor}
13+
import scala.concurrent.duration._
1514
import scala.language.postfixOps
1615

1716
class KvClientSpec extends TestKitSuite with AnyFlatSpecLike with Matchers {
@@ -56,10 +55,6 @@ class KvClientSpec extends TestKitSuite with AnyFlatSpecLike with Matchers {
5655
}
5756
}
5857

59-
class KvTestClientActor(val serviceRegistryActor: ActorRef) extends Actor with JobLogging with KvClient {
60-
def workflowIdForLogging: PossiblyNotRootWorkflowId = PossiblyNotRootWorkflowId(UUID.randomUUID())
61-
def rootWorkflowIdForLogging: RootWorkflowId = RootWorkflowId(UUID.randomUUID())
62-
def jobTag: String = "foobar"
63-
58+
class KvTestClientActor(val serviceRegistryActor: ActorRef) extends Actor with ActorLogging with KvClient {
6459
override def receive: Receive = kvClientReceive orElse Actor.ignoringBehavior
6560
}

‎supportedBackends/google/pipelines/common/src/main/scala/cromwell/backend/google/pipelines/common/api/clients/PipelinesApiRunCreationClient.scala

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package cromwell.backend.google.pipelines.common.api.clients
22

3-
import akka.actor.{Actor, ActorRef}
3+
import akka.actor.{Actor, ActorLogging, ActorRef}
44
import cromwell.backend.google.pipelines.common.PapiInstrumentation
55
import cromwell.backend.google.pipelines.common.api.PipelinesApiRequestFactory.CreatePipelineParameters
66
import cromwell.backend.google.pipelines.common.api.PipelinesApiRequestManager.{
@@ -10,7 +10,7 @@ import cromwell.backend.google.pipelines.common.api.PipelinesApiRequestManager.{
1010
import cromwell.backend.google.pipelines.common.api.{PipelinesApiRequestFactory, PipelinesApiRequestManager}
1111
import cromwell.backend.standard.StandardAsyncJob
1212
import cromwell.core.WorkflowId
13-
import cromwell.core.logging.{JobLogger, JobLogging}
13+
import cromwell.core.logging.JobLogger
1414

1515
import scala.concurrent.{Future, Promise}
1616
import scala.util.{Failure, Success, Try}
@@ -33,20 +33,17 @@ object PipelinesApiRunCreationClient {
3333
* Be sure to make the main class's receive look like:
3434
* override def receive = runCreationClientReceive orElse { ... }
3535
*/
36-
trait PipelinesApiRunCreationClient { this: Actor with JobLogging with PapiInstrumentation =>
36+
trait PipelinesApiRunCreationClient { this: Actor with ActorLogging with PapiInstrumentation =>
3737
private var runCreationClientPromise: Option[Promise[StandardAsyncJob]] = None
3838

3939
val papiApiActor: ActorRef
4040
val requestFactory: PipelinesApiRequestFactory
4141

4242
def runCreationClientReceive: Actor.Receive = {
4343
case job: StandardAsyncJob =>
44-
jobLogger.info("AN-522 RunCreation success, received StandardAsyncJob")
4544
runSuccess()
4645
completePromise(Success(job))
47-
case PipelinesApiRunCreationQueryFailed(_, e) =>
48-
jobLogger.info("AN-522 PipelinesApiRunCreationQueryFailed")
49-
completePromise(Failure(e))
46+
case PipelinesApiRunCreationQueryFailed(_, e) => completePromise(Failure(e))
5047
}
5148

5249
private def completePromise(job: Try[StandardAsyncJob]) = {

‎supportedBackends/google/pipelines/common/src/main/scala/cromwell/backend/google/pipelines/common/api/clients/PipelinesApiStatusRequestClient.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package cromwell.backend.google.pipelines.common.api.clients
22

3-
import akka.actor.{Actor, ActorRef}
3+
import akka.actor.{Actor, ActorLogging, ActorRef}
44
import cromwell.backend.google.pipelines.common.PapiInstrumentation
55
import cromwell.backend.google.pipelines.common.api.PipelinesApiRequestManager.PipelinesApiStatusQueryFailed
66
import cromwell.backend.google.pipelines.common.api.{PipelinesApiRequestFactory, PipelinesApiRequestManager, RunStatus}
77
import cromwell.backend.standard.StandardAsyncJob
88
import cromwell.core.WorkflowId
9-
import cromwell.core.logging.JobLogging
109

1110
import scala.concurrent.{Future, Promise}
1211
import scala.util.{Failure, Success, Try}
@@ -17,7 +16,7 @@ import scala.util.{Failure, Success, Try}
1716
* Be sure to make the main class's receive look like:
1817
* override def receive = pollingActorClientReceive orElse { ... }
1918
*/
20-
trait PipelinesApiStatusRequestClient { this: Actor with JobLogging with PapiInstrumentation =>
19+
trait PipelinesApiStatusRequestClient { this: Actor with ActorLogging with PapiInstrumentation =>
2120

2221
private var pollingActorClientPromise: Option[Promise[RunStatus]] = None
2322

@@ -26,12 +25,10 @@ trait PipelinesApiStatusRequestClient { this: Actor with JobLogging with PapiIns
2625

2726
def pollingActorClientReceive: Actor.Receive = {
2827
case r: RunStatus =>
29-
jobLogger.info("AN-522 Polled RunStatus received")
3028
log.debug(s"Polled status received: $r")
3129
pollSuccess()
3230
completePromise(Success(r))
3331
case PipelinesApiStatusQueryFailed(_, e) =>
34-
jobLogger.info("AN-522 Poll failed!")
3532
log.debug("JES poll failed!")
3633
completePromise(Failure(e))
3734
}

0 commit comments

Comments
 (0)