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 43f4f94ab6fe38023f4f4ab41316e5d25b784327 Merge: ac782ed17c 1f82cd3233 Author: Michael Blow <[email protected]> AuthorDate: Tue Dec 19 23:26:46 2023 -0500 Merge branch 'gerrit/trinity' into 'master' Change-Id: I869ea2df850ce020a23e7c4beaf61aebda6ef373 .../org/apache/asterix/active/ActiveEvent.java | 8 ++- .../org/apache/asterix/active/ActiveManager.java | 6 +- .../active/ActiveSourceOperatorNodePushable.java | 21 ++++-- .../active/message/ActiveManagerMessage.java | 15 +++-- .../active/message/ActivePartitionMessage.java | 14 +++- .../active/message/ActiveStatsRequestMessage.java | 2 +- .../api/http/server/RebalanceApiServlet.java | 2 +- .../app/active/ActiveEntityEventsListener.java | 49 +++++--------- .../app/active/ActiveNotificationHandler.java | 77 +++++++--------------- .../asterix/app/message/CancelQueryRequest.java | 11 ++-- .../asterix/app/message/CancelQueryResponse.java | 4 ++ .../message/ExecuteStatementRequestMessage.java | 8 ++- .../message/ExecuteStatementResponseMessage.java | 13 ++-- .../message/RegistrationTasksResponseMessage.java | 5 ++ .../org/apache/asterix/common/TestDataUtil.java | 2 +- .../asterix/test/active/ActiveStatsTest.java | 2 +- .../asterix/test/active/RuntimeRegistration.java | 2 +- .../test/active/TestNodeControllerActor.java | 2 +- .../apache/asterix/test/active/TestUserActor.java | 2 +- .../common/context/DatasetLifecycleManager.java | 2 +- .../ioopcallbacks/LSMIOOperationCallback.java | 5 +- .../src/main/resources/asx_errormsg/en.properties | 4 +- .../dataflow/FeedRecordDataFlowController.java | 14 +++- .../src/main/resources/errormsg/en.properties | 2 +- .../control/cc/work/ApplicationMessageWork.java | 10 ++- .../cc/work/GetNodeControllersInfoWork.java | 9 ++- .../cc/work/GetResultDirectoryAddressWork.java | 7 ++ .../hyracks/control/cc/work/JobCleanupWork.java | 17 +++-- .../hyracks/control/cc/work/JobStartWork.java | 11 ++++ .../cc/work/JobletCleanupNotificationWork.java | 7 ++ .../hyracks/control/cc/work/RegisterNodeWork.java | 6 ++ .../control/cc/work/RemoveDeadNodesWork.java | 4 +- .../hyracks/control/cc/work/TaskCompleteWork.java | 12 ++++ .../control/nc/work/ApplicationMessageWork.java | 14 ++-- .../hyracks/control/nc/work/CleanupJobletWork.java | 9 ++- .../control/nc/work/NotifyTaskCompleteWork.java | 21 ++++-- .../hyracks/control/nc/work/StartTasksWork.java | 2 +- .../am/common/dataflow/IndexDataflowHelper.java | 3 +- .../am/common/dataflow/IndexLifecycleManager.java | 2 +- .../lsm/common/impls/AbstractLSMDiskComponent.java | 9 ++- .../am/lsm/common/impls/AbstractLSMIndex.java | 10 ++- .../common/impls/AbstractLSMMemoryComponent.java | 6 +- .../am/lsm/common/impls/EmptyComponent.java | 5 ++ .../storage/am/lsm/common/impls/LSMHarness.java | 22 ++++--- .../storage/am/lsm/common/util/ComponentUtils.java | 51 ++------------ 45 files changed, 278 insertions(+), 231 deletions(-) diff --cc asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RebalanceApiServlet.java index c730dd0de1,021c3fb5c9..0977e467b6 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RebalanceApiServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RebalanceApiServlet.java @@@ -273,12 -261,12 +273,12 @@@ public class RebalanceApiServlet extend try { ActiveNotificationHandler activeNotificationHandler = (ActiveNotificationHandler) appCtx.getActiveNotificationHandler(); - activeNotificationHandler.suspend(metadataProvider); + activeNotificationHandler.suspend(metadataProvider, "rebalance api"); try { IMetadataLockManager lockManager = appCtx.getMetadataLockManager(); - lockManager.acquireDatasetExclusiveModificationLock(metadataProvider.getLocks(), dataverseName, - datasetName); - RebalanceUtil.rebalance(dataverseName, datasetName, targetNodes, metadataProvider, hcc, + lockManager.acquireDatasetExclusiveModificationLock(metadataProvider.getLocks(), database, + dataverseName, datasetName); + RebalanceUtil.rebalance(database, dataverseName, datasetName, targetNodes, metadataProvider, hcc, NoOpDatasetRebalanceCallback.INSTANCE, force); } finally { activeNotificationHandler.resume(metadataProvider); diff --cc asterixdb/asterix-app/src/test/java/org/apache/asterix/common/TestDataUtil.java index b213e9d4e8,3449ee3e65..f22962fa78 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/common/TestDataUtil.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/common/TestDataUtil.java @@@ -195,14 -162,13 +195,14 @@@ public class TestDataUtil try { ActiveNotificationHandler activeNotificationHandler = (ActiveNotificationHandler) ccAppCtx.getActiveNotificationHandler(); - activeNotificationHandler.suspend(metadataProvider); + activeNotificationHandler.suspend(metadataProvider, ""); try { IMetadataLockManager lockManager = ccAppCtx.getMetadataLockManager(); - lockManager.acquireDatasetExclusiveModificationLock(metadataProvider.getLocks(), dataverseName, - datasetName); - RebalanceUtil.rebalance(dataverseName, datasetName, new LinkedHashSet<>(Arrays.asList(targetNodes)), - metadataProvider, ccAppCtx.getHcc(), NoOpDatasetRebalanceCallback.INSTANCE, false); + lockManager.acquireDatasetExclusiveModificationLock(metadataProvider.getLocks(), database, + dataverseName, datasetName); + RebalanceUtil.rebalance(database, dataverseName, datasetName, + new LinkedHashSet<>(Arrays.asList(targetNodes)), metadataProvider, ccAppCtx.getHcc(), + NoOpDatasetRebalanceCallback.INSTANCE, false); } finally { activeNotificationHandler.resume(metadataProvider); } diff --cc hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java index 461d4167c2,717bcce817..cdf7ad7a17 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java @@@ -582,11 -578,7 +583,11 @@@ public class LSMHarness implements ILSM @Override public void merge(ILSMIOOperation operation) throws HyracksDataException { - LOGGER.debug("Started a merge operation for index {}", lsmIndex); + if (LOGGER.isDebugEnabled()) { + MergeOperation mergeOp = (MergeOperation) operation; - LOGGER.debug("Started a merge operation (number of merging components {}) for index: {}", ++ LOGGER.debug("Started a merge operation (number of merging components {}) for index {}", + mergeOp.getMergingComponents().size(), lsmIndex); + } synchronized (opTracker) { enterComponents(operation.getAccessor().getOpContext(), LSMOperationType.MERGE); }
