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 846d2c74ac98c423c4a2280f378b7b4b3a79297b Author: Michael Blow <[email protected]> AuthorDate: Thu Feb 11 16:47:00 2021 -0500 [NO ISSUE][*DB] Update HTTP post tests to use form-post params - update Rebalance API to accept multiple targetNode parameters, not a comma-separated list of nodes in a nodes parameter Change-Id: I563717ad902a1aa18660f91972af6847c96fd9a0 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/9063 Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Ian Maxon <[email protected]> Integration-Tests: Jenkins <[email protected]> Tested-by: Michael Blow <[email protected]> Tested-by: Jenkins <[email protected]> --- .../api/http/server/RebalanceApiServlet.java | 26 +++++++++------------- .../all_datasets/all_datasets.10.post.http | 5 ++++- .../all_datasets/all_datasets.4.post.http | 4 +++- .../all_datasets_compressed.10.post.http | 5 ++++- .../all_datasets_compressed.4.post.http | 4 +++- .../duplicate_location.3.post.http | 8 ++++++- .../empty_location/empty_location.3.post.http | 5 ++++- .../identical_location.3.post.http | 8 ++++++- .../rebalance/metadata/metadata.1.post.http | 6 ++++- .../miss_dataverse/miss_dataverse.3.post.http | 5 ++++- .../nonexist_dataset/nonexist_dataset.1.post.http | 6 ++++- .../single_dataset/single_dataset.4.post.http | 6 ++++- .../single_dataset/single_dataset.8.post.http | 7 +++++- .../single_dataset_compressed.4.post.http | 6 ++++- .../single_dataset_compressed.8.post.http | 7 +++++- .../single_dataset_with_index.4.post.http | 6 ++++- .../single_dataset_with_index.9.post.http | 7 +++++- ...ingle_dataset_with_index_compressed.4.post.http | 6 ++++- ...ingle_dataset_with_index_compressed.9.post.http | 7 +++++- .../single_dataverse/single_dataverse.10.post.http | 6 ++++- .../single_dataverse/single_dataverse.4.post.http | 5 ++++- .../single_dataverse_compressed.10.post.http | 6 ++++- .../single_dataverse_compressed.4.post.http | 5 ++++- .../replication/bulkload/bulkload.10.post.http | 5 ++++- .../replication/bulkload/bulkload.9.post.http | 5 ++++- .../bulkload.10.post.http | 5 ++++- .../bulkload_with_compression/bulkload.9.post.http | 5 ++++- .../flushed_component.6.post.http | 5 ++++- .../flushed_component.7.post.http | 4 +++- .../flushed_component_compressed.10.post.http | 5 ++++- .../flushed_component_compressed.11.post.http | 5 ++++- .../mem_component_recovery.10.post.http | 5 ++++- .../mem_component_recovery.9.post.http | 5 ++++- .../metadata_failover.6.post.http | 5 ++++- .../metadata_failover.7.post.http | 4 +++- .../release_partition.3.post.http | 4 +++- .../src/test/resources/runtimets/rebalance.xml | 2 +- .../resync_failed_replica.11.post.http | 5 ++++- .../resync_failed_replica.12.post.http | 4 +++- 39 files changed, 175 insertions(+), 54 deletions(-) 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 a7b91c6..8b04cc3 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 @@ -24,11 +24,11 @@ import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.util.ArrayDeque; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Queue; +import java.util.Set; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -106,21 +106,15 @@ public class RebalanceApiServlet extends AbstractServlet { // Gets dataverse, dataset, and target nodes for rebalance. DataverseName dataverseName = ServletUtil.getDataverseName(request, "dataverseName"); String datasetName = request.getParameter("datasetName"); - String nodes = request.getParameter("nodes"); + Set<String> targetNodes = new LinkedHashSet<>(request.getParameterValues("targetNode")); boolean forceRebalance = true; String force = request.getParameter("force"); if (force != null) { forceRebalance = Boolean.parseBoolean(force); } // Parses and check target nodes. - if (nodes == null) { - sendResponse(response, HttpResponseStatus.BAD_REQUEST, "nodes are not given"); - return; - } - String nodesString = nodes.trim(); - String[] targetNodes = nodesString.split(","); - if ("".equals(nodesString)) { - sendResponse(response, HttpResponseStatus.BAD_REQUEST, "target nodes should not be empty"); + if (targetNodes.isEmpty()) { + sendResponse(response, HttpResponseStatus.BAD_REQUEST, "at least one targetNode must be specified"); return; } @@ -161,7 +155,7 @@ public class RebalanceApiServlet extends AbstractServlet { // Schedules a rebalance task. private synchronized CountDownLatch scheduleRebalance(DataverseName dataverseName, String datasetName, - String[] targetNodes, IServletResponse response, boolean force) { + Set<String> targetNodes, IServletResponse response, boolean force) { CountDownLatch terminated = new CountDownLatch(1); Future<Void> task = executor .submit(() -> doRebalance(dataverseName, datasetName, targetNodes, response, terminated, force)); @@ -171,7 +165,7 @@ public class RebalanceApiServlet extends AbstractServlet { } // Performs the actual rebalance. - private Void doRebalance(DataverseName dataverseName, String datasetName, String[] targetNodes, + private Void doRebalance(DataverseName dataverseName, String datasetName, Set<String> targetNodes, IServletResponse response, CountDownLatch terminated, boolean force) { try { // Sets the content type. @@ -248,8 +242,8 @@ public class RebalanceApiServlet extends AbstractServlet { } // Rebalances a given dataset. - private void rebalanceDataset(DataverseName dataverseName, String datasetName, String[] targetNodes, boolean force) - throws Exception { + private void rebalanceDataset(DataverseName dataverseName, String datasetName, Set<String> targetNodes, + boolean force) throws Exception { IHyracksClientConnection hcc = (IHyracksClientConnection) ctx.get(HYRACKS_CONNECTION_ATTR); MetadataProvider metadataProvider = MetadataProvider.create(appCtx, null); try { @@ -260,8 +254,8 @@ public class RebalanceApiServlet extends AbstractServlet { IMetadataLockManager lockManager = appCtx.getMetadataLockManager(); lockManager.acquireDatasetExclusiveModificationLock(metadataProvider.getLocks(), dataverseName, datasetName); - RebalanceUtil.rebalance(dataverseName, datasetName, new LinkedHashSet<>(Arrays.asList(targetNodes)), - metadataProvider, hcc, NoOpDatasetRebalanceCallback.INSTANCE, force); + RebalanceUtil.rebalance(dataverseName, datasetName, targetNodes, metadataProvider, hcc, + NoOpDatasetRebalanceCallback.INSTANCE, force); } finally { activeNotificationHandler.resume(metadataProvider); } diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets/all_datasets.10.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets/all_datasets.10.post.http index 1b14773..1606124 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets/all_datasets.10.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets/all_datasets.10.post.http @@ -17,4 +17,7 @@ * under the License. */ -/admin/rebalance?nodes=asterix_nc1%2Casterix_nc2 +# param targetNode=asterix_nc1 +# param targetNode=asterix_nc2 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets/all_datasets.4.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets/all_datasets.4.post.http index af6b1cf..81c5e88 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets/all_datasets.4.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets/all_datasets.4.post.http @@ -17,4 +17,6 @@ * under the License. */ -/admin/rebalance?nodes=asterix_nc1 +# param targetNode=asterix_nc1 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets_compressed/all_datasets_compressed.10.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets_compressed/all_datasets_compressed.10.post.http index 1b14773..1606124 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets_compressed/all_datasets_compressed.10.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets_compressed/all_datasets_compressed.10.post.http @@ -17,4 +17,7 @@ * under the License. */ -/admin/rebalance?nodes=asterix_nc1%2Casterix_nc2 +# param targetNode=asterix_nc1 +# param targetNode=asterix_nc2 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets_compressed/all_datasets_compressed.4.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets_compressed/all_datasets_compressed.4.post.http index af6b1cf..81c5e88 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets_compressed/all_datasets_compressed.4.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets_compressed/all_datasets_compressed.4.post.http @@ -17,4 +17,6 @@ * under the License. */ -/admin/rebalance?nodes=asterix_nc1 +# param targetNode=asterix_nc1 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/duplicate_location/duplicate_location.3.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/duplicate_location/duplicate_location.3.post.http index 3828950..bef5fe4 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/duplicate_location/duplicate_location.3.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/duplicate_location/duplicate_location.3.post.http @@ -17,4 +17,10 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&datasetName=LineItem&nodes=asterix_nc1%2Casterix_nc1%2Casterix_nc1 +# param dataverseName=tpch +# param datasetName=LineItem +# param targetNode=asterix_nc1 +# param targetNode=asterix_nc1 +# param targetNode=asterix_nc1 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/empty_location/empty_location.3.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/empty_location/empty_location.3.post.http index a488876..4409856 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/empty_location/empty_location.3.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/empty_location/empty_location.3.post.http @@ -17,4 +17,7 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&datasetName=LineItem&nodes= +# param dataverseName=tpch +# param datasetName=LineItem + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/identical_location/identical_location.3.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/identical_location/identical_location.3.post.http index d5427da..98b5ed1 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/identical_location/identical_location.3.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/identical_location/identical_location.3.post.http @@ -17,4 +17,10 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&datasetName=LineItem&nodes=asterix_nc2%2Casterix_nc1&force=false +# param dataverseName=tpch +# param datasetName=LineItem +# param targetNode=asterix_nc2 +# param targetNode=asterix_nc1 +# param force=false + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/metadata/metadata.1.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/metadata/metadata.1.post.http index 53a6b6a..6f36577 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/metadata/metadata.1.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/metadata/metadata.1.post.http @@ -17,4 +17,8 @@ * under the License. */ -/admin/rebalance?dataverseName=Metadata&datasetName=Dataset&nodes=asterix_nc1 +# param dataverseName=Metadata +# param datasetName=Dataset +# param targetNode=asterix_nc1 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/miss_dataverse/miss_dataverse.3.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/miss_dataverse/miss_dataverse.3.post.http index 81060ca..56e4d6b 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/miss_dataverse/miss_dataverse.3.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/miss_dataverse/miss_dataverse.3.post.http @@ -17,4 +17,7 @@ * under the License. */ -/admin/rebalance?datasetName=LineItem&nodes=asterix_nc1 +# param datasetName=LineItem +# param targetNode=asterix_nc1 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/nonexist_dataset/nonexist_dataset.1.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/nonexist_dataset/nonexist_dataset.1.post.http index 0065c1f..8de754d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/nonexist_dataset/nonexist_dataset.1.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/nonexist_dataset/nonexist_dataset.1.post.http @@ -17,4 +17,8 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&datasetName=LineItem&nodes=asterix_nc1 +# param dataverseName=tpch +# param datasetName=LineItem +# param targetNode=asterix_nc1 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset/single_dataset.4.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset/single_dataset.4.post.http index 0065c1f..8de754d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset/single_dataset.4.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset/single_dataset.4.post.http @@ -17,4 +17,8 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&datasetName=LineItem&nodes=asterix_nc1 +# param dataverseName=tpch +# param datasetName=LineItem +# param targetNode=asterix_nc1 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset/single_dataset.8.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset/single_dataset.8.post.http index 44d7f33..59760a9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset/single_dataset.8.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset/single_dataset.8.post.http @@ -17,4 +17,9 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&datasetName=LineItem&nodes=asterix_nc1%2Casterix_nc2 +# param dataverseName=tpch +# param datasetName=LineItem +# param targetNode=asterix_nc1 +# param targetNode=asterix_nc2 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_compressed/single_dataset_compressed.4.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_compressed/single_dataset_compressed.4.post.http index 0065c1f..8de754d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_compressed/single_dataset_compressed.4.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_compressed/single_dataset_compressed.4.post.http @@ -17,4 +17,8 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&datasetName=LineItem&nodes=asterix_nc1 +# param dataverseName=tpch +# param datasetName=LineItem +# param targetNode=asterix_nc1 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_compressed/single_dataset_compressed.8.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_compressed/single_dataset_compressed.8.post.http index 44d7f33..59760a9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_compressed/single_dataset_compressed.8.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_compressed/single_dataset_compressed.8.post.http @@ -17,4 +17,9 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&datasetName=LineItem&nodes=asterix_nc1%2Casterix_nc2 +# param dataverseName=tpch +# param datasetName=LineItem +# param targetNode=asterix_nc1 +# param targetNode=asterix_nc2 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index/single_dataset_with_index.4.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index/single_dataset_with_index.4.post.http index 0065c1f..8de754d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index/single_dataset_with_index.4.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index/single_dataset_with_index.4.post.http @@ -17,4 +17,8 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&datasetName=LineItem&nodes=asterix_nc1 +# param dataverseName=tpch +# param datasetName=LineItem +# param targetNode=asterix_nc1 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index/single_dataset_with_index.9.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index/single_dataset_with_index.9.post.http index 44d7f33..59760a9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index/single_dataset_with_index.9.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index/single_dataset_with_index.9.post.http @@ -17,4 +17,9 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&datasetName=LineItem&nodes=asterix_nc1%2Casterix_nc2 +# param dataverseName=tpch +# param datasetName=LineItem +# param targetNode=asterix_nc1 +# param targetNode=asterix_nc2 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index_compressed/single_dataset_with_index_compressed.4.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index_compressed/single_dataset_with_index_compressed.4.post.http index 0065c1f..8de754d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index_compressed/single_dataset_with_index_compressed.4.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index_compressed/single_dataset_with_index_compressed.4.post.http @@ -17,4 +17,8 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&datasetName=LineItem&nodes=asterix_nc1 +# param dataverseName=tpch +# param datasetName=LineItem +# param targetNode=asterix_nc1 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index_compressed/single_dataset_with_index_compressed.9.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index_compressed/single_dataset_with_index_compressed.9.post.http index 44d7f33..59760a9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index_compressed/single_dataset_with_index_compressed.9.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index_compressed/single_dataset_with_index_compressed.9.post.http @@ -17,4 +17,9 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&datasetName=LineItem&nodes=asterix_nc1%2Casterix_nc2 +# param dataverseName=tpch +# param datasetName=LineItem +# param targetNode=asterix_nc1 +# param targetNode=asterix_nc2 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse/single_dataverse.10.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse/single_dataverse.10.post.http index 6b713bc..16db13b 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse/single_dataverse.10.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse/single_dataverse.10.post.http @@ -17,4 +17,8 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&nodes=asterix_nc1%2Casterix_nc2 +# param dataverseName=tpch +# param targetNode=asterix_nc1 +# param targetNode=asterix_nc2 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse/single_dataverse.4.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse/single_dataverse.4.post.http index b3897e5..3b14ca7 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse/single_dataverse.4.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse/single_dataverse.4.post.http @@ -17,4 +17,7 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&nodes=asterix_nc1 +# param dataverseName=tpch +# param targetNode=asterix_nc1 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse_compressed/single_dataverse_compressed.10.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse_compressed/single_dataverse_compressed.10.post.http index 6b713bc..16db13b 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse_compressed/single_dataverse_compressed.10.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse_compressed/single_dataverse_compressed.10.post.http @@ -17,4 +17,8 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&nodes=asterix_nc1%2Casterix_nc2 +# param dataverseName=tpch +# param targetNode=asterix_nc1 +# param targetNode=asterix_nc2 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse_compressed/single_dataverse_compressed.4.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse_compressed/single_dataverse_compressed.4.post.http index b3897e5..3b14ca7 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse_compressed/single_dataverse_compressed.4.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse_compressed/single_dataverse_compressed.4.post.http @@ -17,4 +17,7 @@ * under the License. */ -/admin/rebalance?dataverseName=tpch&nodes=asterix_nc1 +# param dataverseName=tpch +# param targetNode=asterix_nc1 + +/admin/rebalance \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload/bulkload.10.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload/bulkload.10.post.http index a3ea801..cd69f25 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload/bulkload.10.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload/bulkload.10.post.http @@ -16,4 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -/admin/cluster/partition/master?partition=3&node=asterix_nc1 \ No newline at end of file +# param partition=3 +# param node=asterix_nc1 + +/admin/cluster/partition/master \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload/bulkload.9.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload/bulkload.9.post.http index 36e1d00..ed393b9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload/bulkload.9.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload/bulkload.9.post.http @@ -16,4 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -/admin/cluster/partition/master?partition=2&node=asterix_nc1 \ No newline at end of file +# param partition=2 +# param node=asterix_nc1 + +/admin/cluster/partition/master \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload_with_compression/bulkload.10.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload_with_compression/bulkload.10.post.http index a3ea801..cd69f25 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload_with_compression/bulkload.10.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload_with_compression/bulkload.10.post.http @@ -16,4 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -/admin/cluster/partition/master?partition=3&node=asterix_nc1 \ No newline at end of file +# param partition=3 +# param node=asterix_nc1 + +/admin/cluster/partition/master \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload_with_compression/bulkload.9.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload_with_compression/bulkload.9.post.http index 36e1d00..ed393b9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload_with_compression/bulkload.9.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/bulkload_with_compression/bulkload.9.post.http @@ -16,4 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -/admin/cluster/partition/master?partition=2&node=asterix_nc1 \ No newline at end of file +# param partition=2 +# param node=asterix_nc1 + +/admin/cluster/partition/master \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component/flushed_component.6.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component/flushed_component.6.post.http index 2e8fc63..7e80cbb 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component/flushed_component.6.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component/flushed_component.6.post.http @@ -16,4 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -/admin/cluster/partition/master?partition=0&node=asterix_nc2 \ No newline at end of file +# param partition=0 +# param node=asterix_nc2 + +/admin/cluster/partition/master \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component/flushed_component.7.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component/flushed_component.7.post.http index e8dca0b..73aaa09 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component/flushed_component.7.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component/flushed_component.7.post.http @@ -16,4 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -/admin/cluster/metadataNode?node=asterix_nc2 \ No newline at end of file +# param node=asterix_nc2 + +/admin/cluster/metadataNode \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component_compressed/flushed_component_compressed.10.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component_compressed/flushed_component_compressed.10.post.http index 36e1d00..ed393b9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component_compressed/flushed_component_compressed.10.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component_compressed/flushed_component_compressed.10.post.http @@ -16,4 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -/admin/cluster/partition/master?partition=2&node=asterix_nc1 \ No newline at end of file +# param partition=2 +# param node=asterix_nc1 + +/admin/cluster/partition/master \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component_compressed/flushed_component_compressed.11.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component_compressed/flushed_component_compressed.11.post.http index a3ea801..cd69f25 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component_compressed/flushed_component_compressed.11.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/flushed_component_compressed/flushed_component_compressed.11.post.http @@ -16,4 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -/admin/cluster/partition/master?partition=3&node=asterix_nc1 \ No newline at end of file +# param partition=3 +# param node=asterix_nc1 + +/admin/cluster/partition/master \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/mem_component_recovery/mem_component_recovery.10.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/mem_component_recovery/mem_component_recovery.10.post.http index a3ea801..cd69f25 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/mem_component_recovery/mem_component_recovery.10.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/mem_component_recovery/mem_component_recovery.10.post.http @@ -16,4 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -/admin/cluster/partition/master?partition=3&node=asterix_nc1 \ No newline at end of file +# param partition=3 +# param node=asterix_nc1 + +/admin/cluster/partition/master \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/mem_component_recovery/mem_component_recovery.9.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/mem_component_recovery/mem_component_recovery.9.post.http index 36e1d00..ed393b9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/mem_component_recovery/mem_component_recovery.9.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/mem_component_recovery/mem_component_recovery.9.post.http @@ -16,4 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -/admin/cluster/partition/master?partition=2&node=asterix_nc1 \ No newline at end of file +# param partition=2 +# param node=asterix_nc1 + +/admin/cluster/partition/master \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/metadata_failover/metadata_failover.6.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/metadata_failover/metadata_failover.6.post.http index 2e8fc63..7e80cbb 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/metadata_failover/metadata_failover.6.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/metadata_failover/metadata_failover.6.post.http @@ -16,4 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -/admin/cluster/partition/master?partition=0&node=asterix_nc2 \ No newline at end of file +# param partition=0 +# param node=asterix_nc2 + +/admin/cluster/partition/master \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/metadata_failover/metadata_failover.7.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/metadata_failover/metadata_failover.7.post.http index e8dca0b..73aaa09 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/metadata_failover/metadata_failover.7.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/metadata_failover/metadata_failover.7.post.http @@ -16,4 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -/admin/cluster/metadataNode?node=asterix_nc2 \ No newline at end of file +# param node=asterix_nc2 + +/admin/cluster/metadataNode \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/release_partition/release_partition.3.post.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/release_partition/release_partition.3.post.http index bb942d8..86363c0 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/release_partition/release_partition.3.post.http +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/replication/release_partition/release_partition.3.post.http @@ -16,4 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -nc:asterix_nc1 /admin/storage/release?partition=0 \ No newline at end of file +# param partition=0 + +nc:asterix_nc1 /admin/storage/release \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/rebalance.xml b/asterixdb/asterix-app/src/test/resources/runtimets/rebalance.xml index ebafab8..45077a9 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/rebalance.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/rebalance.xml @@ -28,7 +28,7 @@ <output-dir compare="Text">empty_location</output-dir> <expected-error>HTTP operation failed: STATUS LINE: HTTP/1.1 400 Bad Request -ERROR_BODY: {"results":"target nodes should not be empty"}</expected-error> +ERROR_BODY: {"results":"at least one targetNode must be specified"}</expected-error> </compilation-unit> </test-case> <test-case FilePath="rebalance"> diff --git a/asterixdb/asterix-server/src/test/resources/integrationts/replication/queries/failover/resync_failed_replica/resync_failed_replica.11.post.http b/asterixdb/asterix-server/src/test/resources/integrationts/replication/queries/failover/resync_failed_replica/resync_failed_replica.11.post.http index 2e8fc63..7e80cbb 100644 --- a/asterixdb/asterix-server/src/test/resources/integrationts/replication/queries/failover/resync_failed_replica/resync_failed_replica.11.post.http +++ b/asterixdb/asterix-server/src/test/resources/integrationts/replication/queries/failover/resync_failed_replica/resync_failed_replica.11.post.http @@ -16,4 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -/admin/cluster/partition/master?partition=0&node=asterix_nc2 \ No newline at end of file +# param partition=0 +# param node=asterix_nc2 + +/admin/cluster/partition/master \ No newline at end of file diff --git a/asterixdb/asterix-server/src/test/resources/integrationts/replication/queries/failover/resync_failed_replica/resync_failed_replica.12.post.http b/asterixdb/asterix-server/src/test/resources/integrationts/replication/queries/failover/resync_failed_replica/resync_failed_replica.12.post.http index e8dca0b..73aaa09 100644 --- a/asterixdb/asterix-server/src/test/resources/integrationts/replication/queries/failover/resync_failed_replica/resync_failed_replica.12.post.http +++ b/asterixdb/asterix-server/src/test/resources/integrationts/replication/queries/failover/resync_failed_replica/resync_failed_replica.12.post.http @@ -16,4 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -/admin/cluster/metadataNode?node=asterix_nc2 \ No newline at end of file +# param node=asterix_nc2 + +/admin/cluster/metadataNode \ No newline at end of file
