Yingyi Bu has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1863
Change subject: WIP: Add rebalance callback.
......................................................................
WIP: Add rebalance callback.
Change-Id: I9a90ba975467c136371236195f82d48430d8319d
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RebalanceApiServlet.java
A
asterixdb/asterix-app/src/main/java/org/apache/asterix/rebalance/IDatasetRebalanceCallback.java
A
asterixdb/asterix-app/src/main/java/org/apache/asterix/rebalance/NoOpDatasetRebalanceCallback.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java
4 files changed, 88 insertions(+), 4 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/63/1863/1
diff --git
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
index 3bd1be5..e9d231a 100644
---
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
@@ -43,6 +43,7 @@
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.entities.Dataverse;
+import org.apache.asterix.rebalance.NoOpDatasetRebalanceCallback;
import org.apache.asterix.utils.RebalanceUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.hyracks.api.client.IHyracksClientConnection;
@@ -242,7 +243,7 @@
IHyracksClientConnection hcc = (IHyracksClientConnection)
ctx.get(HYRACKS_CONNECTION_ATTR);
MetadataProvider metadataProvider = new MetadataProvider(appCtx, null,
new StorageComponentProvider());
RebalanceUtil.rebalance(dataverseName, datasetName, new
LinkedHashSet<>(Arrays.asList(targetNodes)),
- metadataProvider, hcc);
+ metadataProvider, hcc, NoOpDatasetRebalanceCallback.INSTANCE);
}
// Sends HTTP response to the request client.
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/rebalance/IDatasetRebalanceCallback.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/rebalance/IDatasetRebalanceCallback.java
new file mode 100644
index 0000000..e6e781c
--- /dev/null
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/rebalance/IDatasetRebalanceCallback.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.asterix.rebalance;
+
+import org.apache.asterix.metadata.declared.MetadataProvider;
+import org.apache.asterix.metadata.entities.Dataset;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+
+public interface IDatasetRebalanceCallback {
+
+ void beforeRebalance(MetadataProvider metadataProvider, Dataset source,
Dataset target) throws HyracksDataException;
+
+ void afterRebalance(MetadataProvider metadataProvider, Dataset source,
Dataset target) throws HyracksDataException;
+
+}
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/rebalance/NoOpDatasetRebalanceCallback.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/rebalance/NoOpDatasetRebalanceCallback.java
new file mode 100644
index 0000000..3be85f4
--- /dev/null
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/rebalance/NoOpDatasetRebalanceCallback.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.asterix.rebalance;
+
+import org.apache.asterix.metadata.declared.MetadataProvider;
+import org.apache.asterix.metadata.entities.Dataset;
+
+public class NoOpDatasetRebalanceCallback implements IDatasetRebalanceCallback
{
+
+ public static NoOpDatasetRebalanceCallback INSTANCE = new
NoOpDatasetRebalanceCallback();
+
+ private NoOpDatasetRebalanceCallback() {
+
+ }
+
+ @Override
+ public void beforeRebalance(MetadataProvider metadataProvider, Dataset
source, Dataset target) {
+
+ }
+
+ @Override
+ public void afterRebalance(MetadataProvider metadataProvider, Dataset
source, Dataset target) {
+
+ }
+
+}
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java
index 3b17a94..4e1cadf 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java
@@ -42,6 +42,7 @@
import org.apache.asterix.metadata.lock.MetadataLockManager;
import org.apache.asterix.metadata.utils.DatasetUtil;
import org.apache.asterix.metadata.utils.IndexUtil;
+import org.apache.asterix.rebalance.IDatasetRebalanceCallback;
import org.apache.asterix.runtime.job.listener.JobEventListenerFactory;
import
org.apache.asterix.transaction.management.service.transaction.JobIdFactory;
import
org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
@@ -85,7 +86,8 @@
* @throws Exception
*/
public static void rebalance(String dataverseName, String datasetName,
Set<String> targetNcNames,
- MetadataProvider metadataProvider, IHyracksClientConnection hcc)
throws Exception {
+ MetadataProvider metadataProvider, IHyracksClientConnection hcc,
+ IDatasetRebalanceCallback datasetRebalanceCallback) throws
Exception {
Dataset sourceDataset;
Dataset targetDataset;
// Executes the first Metadata transaction.
@@ -118,7 +120,7 @@
targetDataset = new Dataset(sourceDataset, true, nodeGroupName);
// Rebalances the source dataset into the target dataset.
- rebalance(sourceDataset, targetDataset, metadataProvider, hcc);
+ rebalance(sourceDataset, targetDataset, metadataProvider, hcc,
datasetRebalanceCallback);
// Complete the metadata transaction.
MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
@@ -192,9 +194,12 @@
// Rebalances from the source to the target.
private static void rebalance(Dataset source, Dataset target,
MetadataProvider metadataProvider,
- IHyracksClientConnection hcc) throws Exception {
+ IHyracksClientConnection hcc, IDatasetRebalanceCallback
datasetRebalanceCallback) throws Exception {
// Drops the target dataset files (if any) to make rebalance
idempotent.
dropDatasetFiles(target, metadataProvider, hcc);
+
+ // Performs the specified operation before the target dataset is
populated.
+ datasetRebalanceCallback.beforeRebalance(metadataProvider, source,
target);
// Creates the rebalance target.
createRebalanceTarget(target, metadataProvider, hcc);
@@ -204,6 +209,9 @@
// Creates and loads indexes for the rebalance target.
createAndLoadSecondaryIndexesForTarget(source, target,
metadataProvider, hcc);
+
+ // Performs the specified operation after the target dataset is
populated.
+ datasetRebalanceCallback.afterRebalance(metadataProvider, source,
target);
}
// Switches the metadata entity from the source dataset to the target
dataset.
--
To view, visit https://asterix-gerrit.ics.uci.edu/1863
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a90ba975467c136371236195f82d48430d8319d
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <[email protected]>
