(asterixdb) 11/14: Merge branch 'gerrit/neo' into 'gerrit/trinity'

[mblow]

This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit f9681dc20c85bf7682dfba6959ce3dc8a774a1d2
Merge: b4120d1672 9b4dbe4f46
Author: Michael Blow <michael.b...@couchbase.com>
AuthorDate: Sun Jun 9 21:18:46 2024 -0400

    Merge branch 'gerrit/neo' into 'gerrit/trinity'
    
    Change-Id: I7ee726406bf54a998b3c33ed54844e2d6dc0c5c0

 .../main/java/org/apache/asterix/active/ActiveManager.java |  9 +++++++--
 .../asterix/app/active/ActiveEntityEventsListener.java     | 14 +++++++-------
 .../asterix/app/active/ActiveNotificationHandler.java      |  2 +-
 .../org/apache/asterix/app/message/CancelQueryRequest.java |  4 ++--
 .../apache/asterix/app/message/CancelQueryResponse.java    |  2 +-
 .../java/org/apache/hyracks/control/cc/job/JobManager.java | 10 +++++-----
 .../hyracks/control/cc/partitions/PartitionMatchMaker.java |  4 ++--
 .../control/cc/work/GetResultPartitionLocationsWork.java   |  6 ++++++
 .../org/apache/hyracks/control/cc/work/JobCleanupWork.java |  7 +++++++
 .../apache/hyracks/control/cc/work/TaskFailureWork.java    |  4 +++-
 .../hyracks/control/cc/work/WaitForJobCompletionWork.java  |  6 ++++++
 .../apache/hyracks/control/nc/work/CleanupJobletWork.java  |  2 +-
 12 files changed, 48 insertions(+), 22 deletions(-)

diff --cc 
asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveManager.java
index 636279cb09,ed481bc666..2720510b57
--- 
a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveManager.java
+++ 
b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveManager.java
@@@ -103,16 -103,16 +103,18 @@@ public class ActiveManager 
          return ActiveManager.class.getSimpleName() + "[" + nodeId + "]";
      }
  
 -    public void submit(ActiveManagerMessage message) throws 
HyracksDataException {
 +    public void handle(ActiveManagerMessage message) throws 
HyracksDataException {
-         LOGGER.debug("NC handling {}({})({})", message.getKind(), 
message.getRuntimeId(), message.getDesc());
          switch (message.getKind()) {
              case STOP_ACTIVITY:
 -                LOGGER.debug("Message of type {} received in {}", 
message.getKind(), nodeId);
++                logHandle(Level.DEBUG, message);
                  stopRuntime(message);
                  break;
              case REQUEST_STATS:
++                logHandle(Level.TRACE, message);
                  requestStats((ActiveStatsRequestMessage) message);
                  break;
              case GENERIC_EVENT:
++                logHandle(Level.DEBUG, message);
                  deliverGenericEvent(message);
                  break;
              default:
@@@ -120,6 -120,6 +122,10 @@@
          }
      }
  
++    private void logHandle(Level level, ActiveManagerMessage message) {
++        LOGGER.log(level, "NC handling {}({})({})", message.getKind(), 
message.getRuntimeId(), message.getDesc());
++    }
++
      private void deliverGenericEvent(ActiveManagerMessage message) throws 
HyracksDataException {
          try {
              ActiveRuntimeId runtimeId = message.getRuntimeId();