You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:46:27 UTC
[24/50] brooklyn-library git commit: Adds SoftwareProcessDriver.kill
Adds SoftwareProcessDriver.kill
- To be used primarily for testing, where server dies
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/8ddba97d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/8ddba97d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/8ddba97d
Branch: refs/heads/0.4.0
Commit: 8ddba97d4e94b5180c4b6cf5324cbb3e74354d9e
Parents: c582285
Author: Aled Sage <al...@gmail.com>
Authored: Sat Oct 6 15:29:17 2012 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Sat Oct 6 15:29:17 2012 +0100
----------------------------------------------------------------------
.../java/brooklyn/entity/database/mysql/MySqlSshDriver.groovy | 4 ++++
.../entity/messaging/activemq/ActiveMQSshDriver.groovy | 5 +++++
.../java/brooklyn/entity/messaging/qpid/QpidSshDriver.groovy | 5 +++++
.../brooklyn/entity/messaging/rabbit/RabbitSshDriver.groovy | 5 +++++
.../main/java/brooklyn/entity/osgi/karaf/KarafSshDriver.java | 5 +++++
.../main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java | 5 +++++
.../java/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java | 5 +++++
.../java/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java | 6 ++++++
.../java/brooklyn/entity/webapp/tomcat/Tomcat7SshDriver.java | 6 ++++++
9 files changed, 46 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8ddba97d/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.groovy
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.groovy b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.groovy
index 9f7b9be..a5c9bf0 100644
--- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.groovy
+++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.groovy
@@ -153,4 +153,8 @@ datadir = .
newScript(STOPPING, usePidFile: true).execute();
}
+ @Override
+ public void kill() {
+ newScript(KILLING, usePidFile: true).execute();
+ }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8ddba97d/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.groovy
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.groovy b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.groovy
index dc6b390..6e134bb 100644
--- a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.groovy
+++ b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.groovy
@@ -70,6 +70,11 @@ public class ActiveMQSshDriver extends JavaSoftwareProcessSshDriver implements A
newScript(STOPPING, usePidFile:pidFile).execute();
}
+ @Override
+ public void kill() {
+ newScript(KILLING, usePidFile:pidFile).execute();
+ }
+
public Map<String, String> getShellEnvironment() {
def result = super.getShellEnvironment()
result << [
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8ddba97d/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidSshDriver.groovy
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidSshDriver.groovy b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidSshDriver.groovy
index b58c31a..6b8f020 100644
--- a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidSshDriver.groovy
+++ b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidSshDriver.groovy
@@ -90,6 +90,11 @@ public class QpidSshDriver extends JavaSoftwareProcessSshDriver implements QpidD
newScript(STOPPING, usePidFile:pidFile).execute();
}
+ @Override
+ public void kill() {
+ newScript(KILLING, usePidFile:pidFile).execute();
+ }
+
public Map<String, String> getShellEnvironment() {
Map result = super.getShellEnvironment()
result << [
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8ddba97d/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.groovy
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.groovy b/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.groovy
index e137dae..3d28b2c 100644
--- a/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.groovy
+++ b/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.groovy
@@ -96,6 +96,11 @@ public class RabbitSshDriver extends AbstractSoftwareProcessSshDriver implements
.execute()
}
+ @Override
+ public void kill() {
+ stop(); // TODO No pid file to easily do `kill -9`
+ }
+
public Map<String, String> getShellEnvironment() {
Map result = super.getShellEnvironment()
result << [
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8ddba97d/software/osgi/src/main/java/brooklyn/entity/osgi/karaf/KarafSshDriver.java
----------------------------------------------------------------------
diff --git a/software/osgi/src/main/java/brooklyn/entity/osgi/karaf/KarafSshDriver.java b/software/osgi/src/main/java/brooklyn/entity/osgi/karaf/KarafSshDriver.java
index 75d4b0f..b52829b 100644
--- a/software/osgi/src/main/java/brooklyn/entity/osgi/karaf/KarafSshDriver.java
+++ b/software/osgi/src/main/java/brooklyn/entity/osgi/karaf/KarafSshDriver.java
@@ -105,6 +105,11 @@ public class KarafSshDriver extends JavaSoftwareProcessSshDriver implements Kara
}
@Override
+ public void kill() {
+ stop(); // TODO no pid file to easily do `kill -9`
+ }
+
+ @Override
protected List<String> getCustomJavaConfigOptions() {
List<String> result = new LinkedList<String>();
result.addAll(super.getCustomJavaConfigOptions());
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8ddba97d/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java
index 4cce55c..022a331 100644
--- a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java
+++ b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java
@@ -180,6 +180,11 @@ public class NginxSshDriver extends AbstractSoftwareProcessSshDriver implements
}
@Override
+ public void kill() {
+ stop(); // TODO Don't `kill -9`, as that doesn't stop the worker processes
+ }
+
+ @Override
public void restart() {
try {
if (isRunning()) {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8ddba97d/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java b/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
index c9426a5..6d8d675 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
@@ -146,6 +146,11 @@ public class JBoss6SshDriver extends JavaWebAppSshDriver implements JBoss6Driver
}
@Override
+ public void kill() {
+ stop(); // TODO No pid file to easily do a `kill -9`
+ }
+
+ @Override
protected List<String> getCustomJavaConfigOptions() {
List<String> options = new LinkedList<String>();
options.addAll(super.getCustomJavaConfigOptions());
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8ddba97d/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java b/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java
index b63c878..ccf8515 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java
@@ -141,6 +141,12 @@ class JBoss7SshDriver extends JavaWebAppSshDriver implements JBoss7Driver {
}
@Override
+ public void kill() {
+ Map flags = MutableMap.of("usePidFile", true);
+ newScript(flags, KILLING).execute();
+ }
+
+ @Override
protected List<String> getCustomJavaConfigOptions() {
List<String> options = new LinkedList<String>();
options.addAll(super.getCustomJavaConfigOptions());
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8ddba97d/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/Tomcat7SshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/Tomcat7SshDriver.java b/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/Tomcat7SshDriver.java
index 63cc155..255ed06 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/Tomcat7SshDriver.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/Tomcat7SshDriver.java
@@ -95,6 +95,12 @@ public class Tomcat7SshDriver extends JavaWebAppSshDriver implements Tomcat7Driv
}
@Override
+ public void kill() {
+ Map flags = MutableMap.of("usePidFile","pid.txt");
+ newScript(flags, KILLING).execute();
+ }
+
+ @Override
protected List<String> getCustomJavaConfigOptions() {
List<String> options = new LinkedList<String>();
options.addAll(super.getCustomJavaConfigOptions());