You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2019/10/28 23:15:23 UTC
[lucene-solr] branch jira/solr-13662-2 updated: Fixing bug
This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch jira/solr-13662-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/solr-13662-2 by this push:
new 5f5602d Fixing bug
5f5602d is described below
commit 5f5602d3fcd300bd7362565058044b9492d710b9
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Tue Oct 29 04:45:34 2019 +0530
Fixing bug
---
.../java/org/apache/solr/packagemanager/SolrPackageManager.java | 7 +++++--
solr/core/src/java/org/apache/solr/util/PackageTool.java | 5 +++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/packagemanager/SolrPackageManager.java b/solr/core/src/java/org/apache/solr/packagemanager/SolrPackageManager.java
index a59feed..28808b5 100644
--- a/solr/core/src/java/org/apache/solr/packagemanager/SolrPackageManager.java
+++ b/solr/core/src/java/org/apache/solr/packagemanager/SolrPackageManager.java
@@ -136,10 +136,13 @@ public class SolrPackageManager implements Closeable {
throw new RuntimeException(e);
}
+ String paramsJson = SolrPackageManager.get(solrBaseUrl+"/api/collections/"+collection+"/config/params?omitHeader=true");
+ System.out.println("Before Posting param: "+paramsJson);
+
// Set the package version in the collection's parameters
postJson(solrBaseUrl+"/api/collections/"+collection+"/config/params", "{set:{PKG_VERSIONS:{"+packageName+" : '"+(pegToLatest? "$LATEST": version)+"'}}}");
- String paramsJson = SolrPackageManager.get("http://localhost:8983/api/collections/"+collection+"/config/params?omitHeader=true");
+ paramsJson = SolrPackageManager.get(solrBaseUrl+"/api/collections/"+collection+"/config/params?omitHeader=true");
System.out.println("Posted param: "+paramsJson);
// If updating, refresh the package version for this to take effect
@@ -165,7 +168,7 @@ public class SolrPackageManager implements Closeable {
// Set the package version in the collection's parameters
postJson(solrBaseUrl+"/api/collections/"+collection+"/config/params", "{update:{PKG_VERSIONS:{'"+packageName+"' : '"+(pegToLatest? "$LATEST": version)+"'}}}");
- paramsJson = SolrPackageManager.get("http://localhost:8983/api/collections/"+collection+"/config/params?omitHeader=true");
+ paramsJson = SolrPackageManager.get(solrBaseUrl+"/api/collections/"+collection+"/config/params?omitHeader=true");
System.out.println("Posted param: "+paramsJson);
}
diff --git a/solr/core/src/java/org/apache/solr/util/PackageTool.java b/solr/core/src/java/org/apache/solr/util/PackageTool.java
index 1f7e2d4..0138f6e 100644
--- a/solr/core/src/java/org/apache/solr/util/PackageTool.java
+++ b/solr/core/src/java/org/apache/solr/util/PackageTool.java
@@ -59,6 +59,7 @@ public class PackageTool extends SolrCLI.ToolBase {
}
public static String solrUrl = null;
+ public static String solrBaseUrl = null;
public SolrPackageManager packageManager;
public SolrUpdateManager updateManager;
@@ -69,7 +70,7 @@ public class PackageTool extends SolrCLI.ToolBase {
Configurator.setRootLevel(Level.INFO);
solrUrl = cli.getOptionValues("solrUrl")[cli.getOptionValues("solrUrl").length-1];
- String solrBaseUrl = solrUrl.replaceAll("\\/solr$", ""); // strip out ending "/solr"
+ solrBaseUrl = solrUrl.replaceAll("\\/solr$", ""); // strip out ending "/solr"
System.out.println("solr url: "+solrUrl+", solr base url: "+solrBaseUrl);
String zkHost = getZkHost(cli);
@@ -241,7 +242,7 @@ public class PackageTool extends SolrCLI.ToolBase {
for (String collection: allCollections) {
// Check package version installed
// http://localhost:8983/api/collections/abc/config/params/PKG_VERSIONS?omitHeader=true
- String paramsJson = SolrPackageManager.get("http://localhost:8983/api/collections/"+collection+"/config/params/PKG_VERSIONS?omitHeader=true");
+ String paramsJson = SolrPackageManager.get(solrBaseUrl+"/api/collections/"+collection+"/config/params/PKG_VERSIONS?omitHeader=true");
String version = null;
try {
version = JsonPath.parse(paramsJson).read("$['response'].['params'].['PKG_VERSIONS'].['"+pkg.id+"'])");