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/09/15 03:03:52 UTC
[lucene-solr] 02/02: Update commands and Redeployment support
This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch jira/solr-13662
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 499ab1d61e4141d08e737ed21486bd65d43d59e2
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Wed Sep 11 12:29:35 2019 -0400
Update commands and Redeployment support
---
.../apache/solr/packagemanager/SolrPackage.java | 1 +
.../solr/packagemanager/SolrPluginDescriptor.java | 9 +++-
.../apache/solr/packagemanager/SolrPluginInfo.java | 4 ++
.../solr/packagemanager/SolrPluginManager.java | 55 +++++++++++++++++++++-
.../solr/packagemanager/SolrUpdateManager.java | 19 ++------
.../solr/packagemanager/SolrUpdateRepository.java | 1 -
.../src/java/org/apache/solr/util/PackageTool.java | 10 +++-
solr/server/resources/log4j2-console.xml | 4 +-
.../cluster.package.Commands.properties.json | 11 ++++-
9 files changed, 90 insertions(+), 24 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/packagemanager/SolrPackage.java b/solr/core/src/java/org/apache/solr/packagemanager/SolrPackage.java
index 84aae74..2f35ce0 100644
--- a/solr/core/src/java/org/apache/solr/packagemanager/SolrPackage.java
+++ b/solr/core/src/java/org/apache/solr/packagemanager/SolrPackage.java
@@ -8,4 +8,5 @@ public class SolrPackage {
public String repository;
public String sha256;
public List<String> setupCommands;
+ public List<String> updateCommands;
}
\ No newline at end of file
diff --git a/solr/core/src/java/org/apache/solr/packagemanager/SolrPluginDescriptor.java b/solr/core/src/java/org/apache/solr/packagemanager/SolrPluginDescriptor.java
index f310b9b..a9b94f7 100644
--- a/solr/core/src/java/org/apache/solr/packagemanager/SolrPluginDescriptor.java
+++ b/solr/core/src/java/org/apache/solr/packagemanager/SolrPluginDescriptor.java
@@ -9,12 +9,15 @@ public class SolrPluginDescriptor extends DefaultPluginDescriptor {
final private String description;
final private String version;
final private List<String> setupCommands;
+ final private List<String> updateCommands;
- public SolrPluginDescriptor(String id, String description, String version, List<String> setupCommands) {
+ public SolrPluginDescriptor(String id, String description, String version,
+ List<String> setupCommands, List<String> updateCommands) {
this.id = id;
this.description = description;
this.version = version;
this.setupCommands = setupCommands;
+ this.updateCommands = updateCommands;
}
@Override
@@ -35,4 +38,8 @@ public class SolrPluginDescriptor extends DefaultPluginDescriptor {
public List<String> getSetupCommands() {
return setupCommands;
}
+ public List<String> getUpdateCommands() {
+ return updateCommands;
+ }
+
}
diff --git a/solr/core/src/java/org/apache/solr/packagemanager/SolrPluginInfo.java b/solr/core/src/java/org/apache/solr/packagemanager/SolrPluginInfo.java
index 33acf1a..7f4cc8a 100644
--- a/solr/core/src/java/org/apache/solr/packagemanager/SolrPluginInfo.java
+++ b/solr/core/src/java/org/apache/solr/packagemanager/SolrPluginInfo.java
@@ -19,6 +19,9 @@ public class SolrPluginInfo extends PluginInfo {
@SerializedName("setup-commands")
public List<String> setupCommands;
+ @SerializedName("update-commands")
+ public List<String> updateCommands;
+
@Override
public String toString() {
return "SolrPluginRelease{" +
@@ -27,6 +30,7 @@ public class SolrPluginInfo extends PluginInfo {
", requires='" + requires + '\'' +
", url='" + url + '\'' +
", setupCommand='" + setupCommands + '\'' +
+ ", updateCommand='" + updateCommands + '\'' +
", sha512sum='" + sha512sum + '\'' +
'}';
}
diff --git a/solr/core/src/java/org/apache/solr/packagemanager/SolrPluginManager.java b/solr/core/src/java/org/apache/solr/packagemanager/SolrPluginManager.java
index bd3026f..5b27e07 100644
--- a/solr/core/src/java/org/apache/solr/packagemanager/SolrPluginManager.java
+++ b/solr/core/src/java/org/apache/solr/packagemanager/SolrPluginManager.java
@@ -2,6 +2,8 @@ package org.apache.solr.packagemanager;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
import java.net.URL;
import java.nio.file.Path;
import java.util.ArrayList;
@@ -12,6 +14,12 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
import org.pf4j.AbstractPluginManager;
import org.pf4j.DefaultVersionManager;
import org.pf4j.ExtensionFactory;
@@ -51,7 +59,8 @@ public class SolrPluginManager extends AbstractPluginManager {
for (Object packageName: packages.keySet()) {
Map pkg = (Map)packages.get(packageName);
- PluginDescriptor descriptor = new SolrPluginDescriptor(pkg.get("name").toString(), null, pkg.get("version").toString(), (List)pkg.get("setup-commands"));
+ PluginDescriptor descriptor = new SolrPluginDescriptor(pkg.get("name").toString(), null,
+ pkg.get("version").toString(), (List)pkg.get("setup-commands"), (List)pkg.get("update-commands"));
PluginWrapper wrapper = new PluginWrapper(this, descriptor, null, null);
plugins.put(packageName.toString(), wrapper);
ret.add(wrapper);
@@ -62,16 +71,58 @@ public class SolrPluginManager extends AbstractPluginManager {
return ret;
}
- public boolean deployPlugin(String pluginId, List<String> collections) {
+ public boolean deployInstallPlugin(String pluginId, List<String> collections) {
PluginWrapper plugin = getPlugin(pluginId);
System.out.println(((SolrPluginDescriptor)plugin.getDescriptor()).getSetupCommands());
for (String collection: collections) {
for (String cmd: ((SolrPluginDescriptor)plugin.getDescriptor()).getSetupCommands()) {
System.out.println("Executing " + cmd + " for collection:" + collection);
+ postJson("http://localhost:8983/solr/"+collection+"/config", cmd);
}
}
return true;
}
+
+ public boolean deployUpdatePlugin(String pluginId, List<String> collections) {
+ PluginWrapper plugin = getPlugin(pluginId);
+ System.out.println(((SolrPluginDescriptor)plugin.getDescriptor()).getSetupCommands());
+ for (String collection: collections) {
+ for (String cmd: ((SolrPluginDescriptor)plugin.getDescriptor()).getUpdateCommands()) {
+ System.out.println("Executing " + cmd + " for collection:" + collection);
+ postJson("http://localhost:8983/solr/"+collection+"/config", cmd);
+ }
+ }
+ return true;
+ }
+
+
+ private void postJson(String url, String postBody) {
+ try (CloseableHttpClient client = HttpClients.createDefault();) {
+ HttpPost httpPost = new HttpPost(url);
+ StringEntity entity = new StringEntity(postBody);
+ httpPost.setEntity(entity);
+ httpPost.setHeader("Accept", "application/json");
+ httpPost.setHeader("Content-type", "application/json");
+
+ CloseableHttpResponse response = client.execute(httpPost);
+
+ try {
+ HttpEntity rspEntity = response.getEntity();
+ if (rspEntity != null) {
+ InputStream is = rspEntity.getContent();
+ StringWriter writer = new StringWriter();
+ IOUtils.copy(is, writer, "UTF-8");
+ String results = writer.toString();
+ System.out.println(results);
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ } catch (IOException e1) {
+ throw new RuntimeException(e1);
+ }
+ }
+
@Override
public List<PluginWrapper> getPlugins(PluginState pluginState) {
return null;
diff --git a/solr/core/src/java/org/apache/solr/packagemanager/SolrUpdateManager.java b/solr/core/src/java/org/apache/solr/packagemanager/SolrUpdateManager.java
index 4cd5205..f1efeaf 100644
--- a/solr/core/src/java/org/apache/solr/packagemanager/SolrUpdateManager.java
+++ b/solr/core/src/java/org/apache/solr/packagemanager/SolrUpdateManager.java
@@ -47,18 +47,8 @@ public class SolrUpdateManager extends UpdateManager {
@Override
protected synchronized void initRepositoriesFromJson() {
- //System.out.println("Read repositories from '"+repositoriesJson+"'"); //nocommit
- /*try (StringReader reader = new StringReader(repositoriesJsonStr)) {
- Gson gson = new GsonBuilder().create();
- UpdateRepository[] items = gson.fromJson(reader, SolrUpdateRepository[].class);
- repositories = Arrays.asList(items);
- } catch (Exception e) {
- e.printStackTrace();
- repositories = Collections.emptyList();
- }*/
UpdateRepository items[] = new Gson().fromJson(this.repositoriesJsonStr, SolrUpdateRepository[].class);
this.repositories = Arrays.asList(items);
- //System.out.println(repositories);
}
@Override
@@ -113,15 +103,15 @@ public class SolrUpdateManager extends UpdateManager {
String sha256 = uploadToBlobHandler(downloaded);
- addOrUpdatePackage(op, id, version, sha256, repository, release.setupCommands, "some-signature");
- return true; //PluginState.STARTED.equals(state);
+ addOrUpdatePackage(op, id, version, sha256, repository, release.setupCommands, release.updateCommands, "some-signature");
+ return true;
}
public static enum Operation {
INSTALL, UPDATE;
}
- private boolean addOrUpdatePackage(Operation op, String id, String version, String sha256, String repository, List<String> setupCommands, String sig) {
+ private boolean addOrUpdatePackage(Operation op, String id, String version, String sha256, String repository, List<String> setupCommands, List<String> updateCommands, String sig) {
String json;
@@ -135,7 +125,8 @@ public class SolrUpdateManager extends UpdateManager {
+ "version: '"+version+"', "
+ "repository: '"+repository+"', "
+ "sha256: '"+sha256+"', "
- + "setup-commands: "+new Gson().toJson(setupCommands)
+ + "setup-commands: "+new Gson().toJson(setupCommands)+","
+ + "update-commands: "+new Gson().toJson(updateCommands)
+ "}}";
try (CloseableHttpClient client = HttpClients.createDefault();) {
diff --git a/solr/core/src/java/org/apache/solr/packagemanager/SolrUpdateRepository.java b/solr/core/src/java/org/apache/solr/packagemanager/SolrUpdateRepository.java
index de83428..f0e561a 100644
--- a/solr/core/src/java/org/apache/solr/packagemanager/SolrUpdateRepository.java
+++ b/solr/core/src/java/org/apache/solr/packagemanager/SolrUpdateRepository.java
@@ -75,7 +75,6 @@ public class SolrUpdateRepository extends DefaultUpdateRepository {
}
for (PluginRelease r : p.releases) {
- System.out.println(r);
try {
r.url = new URL(getUrl(), r.url).toString();
if (r.date.getTime() == 0) {
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 a1205f2..940e503 100644
--- a/solr/core/src/java/org/apache/solr/util/PackageTool.java
+++ b/solr/core/src/java/org/apache/solr/util/PackageTool.java
@@ -76,6 +76,9 @@ public class PackageTool extends SolrCLI.ToolBase {
case "deploy":
deploy(pluginManager, updateManager, cli.getArgList().subList(1, cli.getArgList().size()));
break;
+ case "redeploy":
+ redeploy(pluginManager, updateManager, cli.getArgList().subList(1, cli.getArgList().size()));
+ break;
case "update":
if (cli.getArgList().size()==1) {
update(pluginManager, updateManager);
@@ -129,7 +132,6 @@ public class PackageTool extends SolrCLI.ToolBase {
}
}
protected void available(SolrPluginManager pluginManager, SolrUpdateManager updateManager, List args) throws PluginException {
- //System.out.println(updateManager.getAvailablePlugins());
System.out.println("Available packages:\n-----");
for (PluginInfo i: updateManager.getPlugins()) {
SolrPluginInfo plugin = (SolrPluginInfo)i;
@@ -146,7 +148,11 @@ public class PackageTool extends SolrCLI.ToolBase {
System.out.println(args.get(0).toString() + " installed.");
}
protected void deploy(SolrPluginManager pluginManager, SolrUpdateManager updateManager, List args) throws PluginException {
- System.out.println(pluginManager.deployPlugin(args.get(0).toString(), args.subList(1, args.size())));
+ System.out.println(pluginManager.deployInstallPlugin(args.get(0).toString(), args.subList(1, args.size())));
+ }
+
+ protected void redeploy(SolrPluginManager pluginManager, SolrUpdateManager updateManager, List args) throws PluginException {
+ System.out.println(pluginManager.deployUpdatePlugin(args.get(0).toString(), args.subList(1, args.size())));
}
protected void update(SolrPluginManager pluginManager, SolrUpdateManager updateManager) throws PluginException {
diff --git a/solr/server/resources/log4j2-console.xml b/solr/server/resources/log4j2-console.xml
index e83edf9..a63a18b 100644
--- a/solr/server/resources/log4j2-console.xml
+++ b/solr/server/resources/log4j2-console.xml
@@ -30,12 +30,12 @@
</Console>
</Appenders>
<Loggers>
- <AsyncLogger name="org.apache.zookeeper" level="WARN"/>
+ <!--AsyncLogger name="org.apache.zookeeper" level="WARN"/>
<AsyncLogger name="org.apache.hadoop" level="WARN"/>
<AsyncRoot level="INFO">
<AppenderRef ref="STDERR"/>
- </AsyncRoot>
+ </AsyncRoot-->
</Loggers>
</Configuration>
diff --git a/solr/solrj/src/resources/apispec/cluster.package.Commands.properties.json b/solr/solrj/src/resources/apispec/cluster.package.Commands.properties.json
index dba5fc0..e8f50e3 100644
--- a/solr/solrj/src/resources/apispec/cluster.package.Commands.properties.json
+++ b/solr/solrj/src/resources/apispec/cluster.package.Commands.properties.json
@@ -26,9 +26,16 @@
"items": {
"type": "string"
},
- "description": "Commands that are passed on to the config API to deploy this plugin"
+ "description": "Commands that are passed on to the config API to install this plugin"
+ },
+ "update-commands": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ },
+ "description": "Commands that are passed on to the config API to update this plugin"
}
},
"required" : ["name","sha256"]
-}
\ No newline at end of file
+}