commit 44005592e91fc0e6b95c78c980f173ab7a18109b
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 14 18:59:38 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 14 18:59:38 2020 +0000
tree 7d4233ab1218ebafefc008f874d9260301c04713
parent 7ad77dfbb96bed9146c5e1057df95fae51e8ecdc
parent 34da1ef2756d887d2e609bcbc3cebf4ac5eb2516

Merge "Include cluster client in log line for command cancellation."

src/com/android/tradefed/cluster/ClusterCommandScheduler.java

diff --git a/src/com/android/tradefed/cluster/ClusterCommandScheduler.java b/src/com/android/tradefed/cluster/ClusterCommandScheduler.java
index 052cf17..218f910 100644
--- a/src/com/android/tradefed/cluster/ClusterCommandScheduler.java
+++ b/src/com/android/tradefed/cluster/ClusterCommandScheduler.java
@@ -384,8 +384,9 @@
                             // TODO: retrieve cancel reason from TFC.
                             String cause =
                                     String.format(
-                                            "Command (requestId=%s, commandId=%s) has been marked"
-                                                    + " canceled by the cluster",
+                                            "The cluster client %s has marked command "
+                                                    + "(requestId=%s, commandId=%s) canceled",
+                                            getClusterClient().getClass().getSimpleName(),
                                             mCommandTask.getRequestId(),
                                             mCommandTask.getCommandId());
                             CLog.w("Stop invocation due to: %s", cause);