You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by se...@apache.org on 2013/04/25 03:36:59 UTC
svn commit: r1471805 - in /hbase/branches/0.95:
hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java
src/main/docbkx/developer.xml
Author: sershe
Date: Thu Apr 25 01:36:58 2013
New Revision: 1471805
URL: http://svn.apache.org/r1471805
Log:
HBASE-8405 Add more custom options to how ClusterManager runs commands
Modified:
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java
hbase/branches/0.95/src/main/docbkx/developer.xml
Modified: hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java?rev=1471805&r1=1471804&r2=1471805&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java (original)
+++ hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java Thu Apr 25 01:36:58 2013
@@ -40,6 +40,7 @@ import org.apache.hadoop.util.Shell;
public class HBaseClusterManager extends ClusterManager {
private String sshUserName;
private String sshOptions;
+ private String sshBeforeCommand;
@Override
public void setConf(Configuration conf) {
@@ -54,6 +55,10 @@ public class HBaseClusterManager extends
if (!extraSshOptions.isEmpty()) {
sshOptions = StringUtils.join(new Object[] { sshOptions, extraSshOptions }, " ");
}
+ sshBeforeCommand = conf.get("hbase.it.clustermanager.ssh.beforeCommand", "");
+ if (!sshBeforeCommand.isEmpty()) {
+ sshBeforeCommand += " && ";
+ }
LOG.info("Running with SSH user [" + sshUserName + "] and options [" + sshOptions + "]");
}
@@ -61,7 +66,6 @@ public class HBaseClusterManager extends
* Executes commands over SSH
*/
protected class RemoteShell extends Shell.ShellCommandExecutor {
-
private String hostname;
private String sshCmd = "/usr/bin/ssh";
@@ -95,7 +99,7 @@ public class HBaseClusterManager extends
StringUtils.join(new String[] { sshCmd,
(sshOptions == null) ? "" : sshOptions,
userAndHost,
- "\"" + StringUtils.join(super.getExecString(), " ") + "\""
+ "\"" + sshBeforeCommand + StringUtils.join(super.getExecString(), " ") + "\""
}, " ")};
}
Modified: hbase/branches/0.95/src/main/docbkx/developer.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/src/main/docbkx/developer.xml?rev=1471805&r1=1471804&r2=1471805&view=diff
==============================================================================
Binary files - no diff available.