You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2017/05/31 21:49:46 UTC
lucene-solr:branch_6x: SOLR-10137: Ensure that ConfigSets created via
API are mutable.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x fc8be1c16 -> 7015fdc56
SOLR-10137: Ensure that ConfigSets created via API are mutable.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7015fdc5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7015fdc5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7015fdc5
Branch: refs/heads/branch_6x
Commit: 7015fdc56309f66455aef0a1049d61b0a0745193
Parents: fc8be1c
Author: Mark Miller <ma...@apache.org>
Authored: Wed May 31 17:44:00 2017 -0400
Committer: Mark Miller <ma...@apache.org>
Committed: Wed May 31 17:49:38 2017 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../java/org/apache/solr/handler/admin/ConfigSetsHandler.java | 4 ++++
.../src/test/org/apache/solr/handler/admin/TestConfigsApi.java | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7015fdc5/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7d62700..c899009 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -65,6 +65,8 @@ Bug Fixes
* SOLR-10360: Solr HDFS snapshot export fails due to FileNotFoundException error when using MR1 instead of
yarn. (Hrishikesh via Mark Miller)
+
+* SOLR-10137: Ensure that ConfigSets created via API are mutable. (Hrishikesh via Mark Miller)
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7015fdc5/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
index 3f857e7..34313d0 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
@@ -238,6 +238,10 @@ public class ConfigSetsHandler extends RequestHandlerBase implements PermissionN
props.put(param, params.get(param));
}
}
+
+ // The configset created via an API should be mutable.
+ props.put("immutable", "false");
+
return props;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7015fdc5/solr/core/src/test/org/apache/solr/handler/admin/TestConfigsApi.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestConfigsApi.java b/solr/core/src/test/org/apache/solr/handler/admin/TestConfigsApi.java
index d2c96a6..c0c193d 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/TestConfigsApi.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestConfigsApi.java
@@ -54,6 +54,6 @@ public class TestConfigsApi extends SolrTestCaseJ4 {
"{name :sample, operation:delete}");
compareOutput(apiBag, "/cluster/configs", POST, "{create:{name : newconf, baseConfigSet: sample }}", null,
- "{operation:create, name :newconf, baseConfigSet: sample }");
+ "{operation:create, name :newconf, baseConfigSet: sample, immutable: false }");
}
}