Change setStatusChange

k8ssandra · Aug 15, 2023 · c1b7ec8 · c1b7ec8
1 parent 20ff27e
commit c1b7ec8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/management-api-agent-common/src/main/java/com/datastax/mgmtapi/NodeOpsProvider.java b/management-api-agent-common/src/main/java/com/datastax/mgmtapi/NodeOpsProvider.java
@@ -777,20 +777,17 @@ public String repair(
           .getStorageService()
           .addNotificationListener(
               (notification, handback) -> {
-                // https://github.com/apache/cassandra/blob/600f4d9a690dbd887d5e6298fe67e6bba982033d/src/java/org/apache/cassandra/utils/progress/jmx/JMXNotificationProgressListener.java#L26
                 if (notification.getType().equals("progress")) {
                   Map<String, Integer> data = (Map<String, Integer>) notification.getUserData();
 
                   ProgressEventType progress = ProgressEventType.values()[data.get("type")];
 
                   switch (progress) {
-                      // TODO Finish these
                     case START:
-                      job.setStatusChange(progress);
+                      job.setStatusChange(progress, notification.getMessage());
                       job.setStartTime(System.currentTimeMillis());
                       break;
                     case PROGRESS:
-                      // Do we care? Progress of what..?
                       break;
                     case ERROR:
                     case ABORT:
@@ -799,16 +796,15 @@ public String repair(
                       job.setFinishedTime(System.currentTimeMillis());
                       break;
                     case SUCCESS:
-                      job.setStatusChange(progress);
-                      // SUCCESS / ERROR do not mean the job has completed yet (COMPLETE is that)
+                      job.setStatusChange(progress, notification.getMessage());
+                      // SUCCESS / ERROR does not mean the job has completed yet (COMPLETE is that)
                       break;
                     case COMPLETE:
-                      job.setStatusChange(progress);
+                      job.setStatusChange(progress, notification.getMessage());
                       job.setStatus(Job.JobStatus.COMPLETED);
                       job.setFinishedTime(System.currentTimeMillis());
                       break;
                     case NOTIFICATION:
-                      // Who cares..?
                       break;
                   }
                   service.updateJob(job);

diff --git a/management-api-agent-common/src/main/java/com/datastax/mgmtapi/util/Job.java b/management-api-agent-common/src/main/java/com/datastax/mgmtapi/util/Job.java
@@ -82,8 +82,8 @@ public void setStatus(JobStatus status) {
     this.status = status;
   }
 
-  public void setStatusChange(ProgressEventType type) {
-    statusChanges.add(new StatusChange(type));
+  public void setStatusChange(ProgressEventType type, String message) {
+    statusChanges.add(new StatusChange(type, message));
   }
 
   public List<StatusChange> getStatusChanges() {