You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/06/27 07:49:21 UTC

[1/2] lucene-solr:feature/autoscaling: SOLR-10272: Update tests to create collections with a specific configset name

Repository: lucene-solr
Updated Branches:
  refs/heads/feature/autoscaling e863d0f54 -> cecd365f8


SOLR-10272: Update tests to create collections with a specific configset name


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d6d5a491
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d6d5a491
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d6d5a491

Branch: refs/heads/feature/autoscaling
Commit: d6d5a49196575c8ada31a225a53f18bc4a614a8d
Parents: e863d0f
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Tue Jun 27 13:18:03 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Tue Jun 27 13:18:03 2017 +0530

----------------------------------------------------------------------
 .../org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d6d5a491/solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java
index 1ca5d4a..6deaa71 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java
@@ -123,7 +123,7 @@ public class ComputePlanActionTest extends SolrCloudTestCase {
     assertEquals(response.get("result").toString(), "success");
 
     CollectionAdminRequest.Create create = CollectionAdminRequest.createCollection("testNodeLost",
-        1, 2);
+        "conf",1, 2);
     create.setMaxShardsPerNode(1);
     create.process(solrClient);
 
@@ -181,7 +181,7 @@ public class ComputePlanActionTest extends SolrCloudTestCase {
     assertEquals(response.get("result").toString(), "success");
 
     CollectionAdminRequest.Create create = CollectionAdminRequest.createCollection("testNodeAdded",
-        1, 2);
+        "conf",1, 2);
     create.setMaxShardsPerNode(2);
     create.process(solrClient);
 


[2/2] lucene-solr:feature/autoscaling: SOLR-10496: Log the operation's parameters instead of useless toString description

Posted by sh...@apache.org.
SOLR-10496: Log the operation's parameters instead of useless toString description


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cecd365f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cecd365f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cecd365f

Branch: refs/heads/feature/autoscaling
Commit: cecd365f8f590475a579ce68f1edeb30e9ad8d69
Parents: d6d5a49
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Tue Jun 27 13:18:53 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Tue Jun 27 13:18:53 2017 +0530

----------------------------------------------------------------------
 .../java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cecd365f/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java
index 52c7ee7..8e12a6c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java
@@ -79,7 +79,7 @@ public class ComputePlanAction implements TriggerAction {
         while (true) {
           SolrRequest operation = suggester.getOperation();
           if (operation == null) break;
-          log.info("Computed Plan: {}", operation);
+          log.info("Computed Plan: {}", operation.getParams());
           Map<String, Object> props = context.getProperties();
           props.compute("operations", (k, v) -> {
             List<SolrRequest> operations = (List<SolrRequest>) v;