Author: asavu
Date: Wed Mar 7 09:24:29 2012
New Revision: 1297908
URL: http://svn.apache.org/viewvc?rev=1297908&view=rev
Log:
WHIRR-542. Only expose start / stop / restart as new CLI commands (Andrei Savu)
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/CleanupClusterCommand.java
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/ConfigureServicesCommand.java
whirr/trunk/cli/src/main/resources/META-INF/services/org.apache.whirr.command.Command
whirr/trunk/core/src/main/java/org/apache/whirr/ClusterController.java
Modified: whirr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1297908&r1=1297907&r2=1297908&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Wed Mar 7 09:24:29 2012
@@ -57,6 +57,8 @@ Trunk (unreleased changes)
WHIRR-509. Provide live OSGi integration tests (Ioannis Canellos, Andrei
Savu)
+ WHIRR-542. Only expose start / stop / restart as new CLI commands (Andrei
Savu)
+
BUG FIXES
WHIRR-473. HadoopServiceController.getInstance(String config) does
Modified:
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/CleanupClusterCommand.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/CleanupClusterCommand.java?rev=1297908&r1=1297907&r2=1297908&view=diff
==============================================================================
---
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/CleanupClusterCommand.java
(original)
+++
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/CleanupClusterCommand.java
Wed Mar 7 09:24:29 2012
@@ -18,6 +18,7 @@
package org.apache.whirr.cli.command;
+import com.google.common.annotations.Beta;
import joptsimple.OptionSet;
import org.apache.whirr.ClusterController;
import org.apache.whirr.ClusterControllerFactory;
@@ -33,6 +34,7 @@ import java.util.List;
/**
* A command to stop the cluster services
*/
+@Beta
public class CleanupClusterCommand extends AbstractClusterCommand {
public CleanupClusterCommand() throws IOException {
Modified:
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/ConfigureServicesCommand.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/ConfigureServicesCommand.java?rev=1297908&r1=1297907&r2=1297908&view=diff
==============================================================================
---
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/ConfigureServicesCommand.java
(original)
+++
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/ConfigureServicesCommand.java
Wed Mar 7 09:24:29 2012
@@ -18,6 +18,7 @@
package org.apache.whirr.cli.command;
+import com.google.common.annotations.Beta;
import joptsimple.OptionSet;
import org.apache.whirr.ClusterController;
import org.apache.whirr.ClusterControllerFactory;
@@ -29,6 +30,7 @@ import java.io.IOException;
/**
* A command to configure the cluster services
*/
+@Beta
public class ConfigureServicesCommand extends RoleLifecycleCommand {
public ConfigureServicesCommand() throws IOException {
Modified:
whirr/trunk/cli/src/main/resources/META-INF/services/org.apache.whirr.command.Command
URL:
http://svn.apache.org/viewvc/whirr/trunk/cli/src/main/resources/META-INF/services/org.apache.whirr.command.Command?rev=1297908&r1=1297907&r2=1297908&view=diff
==============================================================================
---
whirr/trunk/cli/src/main/resources/META-INF/services/org.apache.whirr.command.Command
(original)
+++
whirr/trunk/cli/src/main/resources/META-INF/services/org.apache.whirr.command.Command
Wed Mar 7 09:24:29 2012
@@ -10,11 +10,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
org.apache.whirr.cli.command.LaunchClusterCommand
-org.apache.whirr.cli.command.ConfigureServicesCommand
org.apache.whirr.cli.command.StartServicesCommand
org.apache.whirr.cli.command.StopServicesCommand
org.apache.whirr.cli.command.RestartServicesCommand
-org.apache.whirr.cli.command.CleanupClusterCommand
org.apache.whirr.cli.command.DestroyClusterCommand
org.apache.whirr.cli.command.DestroyInstanceCommand
org.apache.whirr.cli.command.ListClusterCommand
Modified: whirr/trunk/core/src/main/java/org/apache/whirr/ClusterController.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/ClusterController.java?rev=1297908&r1=1297907&r2=1297908&view=diff
==============================================================================
--- whirr/trunk/core/src/main/java/org/apache/whirr/ClusterController.java
(original)
+++ whirr/trunk/core/src/main/java/org/apache/whirr/ClusterController.java Wed
Mar 7 09:24:29 2012
@@ -18,6 +18,7 @@
package org.apache.whirr;
+import com.google.common.annotations.Beta;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -140,15 +141,18 @@ public class ClusterController {
/**
* Configure cluster services
*/
+ @Beta
public Cluster configureServices(ClusterSpec spec) throws IOException,
InterruptedException {
return configureServices(spec, new Cluster(getInstances(spec,
getClusterStateStore(spec))));
}
+ @Beta
public Cluster configureServices(ClusterSpec clusterSpec, Cluster cluster)
throws IOException, InterruptedException {
return configureServices(clusterSpec, cluster, EMPTYSET, EMPTYSET);
}
-
+
+ @Beta
public Cluster configureServices(ClusterSpec clusterSpec, Cluster cluster,
Set<String> targetRoles,
Set<String> targetInstanceIds) throws IOException,
InterruptedException {
ConfigureServicesAction configurer = new
ConfigureServicesAction(getCompute(), handlerMapFactory.create(),
@@ -196,10 +200,12 @@ public class ClusterController {
/**
* Remove the cluster services
*/
+ @Beta
public Cluster cleanupCluster(ClusterSpec spec) throws IOException,
InterruptedException {
return cleanupCluster(spec, new Cluster(getInstances(spec,
getClusterStateStore(spec))));
}
+ @Beta
public Cluster cleanupCluster(ClusterSpec clusterSpec, Cluster cluster)
throws IOException, InterruptedException {
CleanupClusterAction cleanner = new CleanupClusterAction(getCompute(),
handlerMapFactory.create());
