Bug 2187: Remove ShardManager mbean replica operations

Remove the add/remove shard relica mbean operations as it was decided to
use RPCs instead.

Change-Id: I419a1ec57dfaa9b1d8d55aae5a995d8050b43d70
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shardmanager/ShardManagerInfo.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shardmanager/ShardManagerInfo.java
index 94bf67557be278d1510a54457967c177fffe82d5..79beae72a339acac1438d652c16b8b3cd8512e55 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shardmanager/ShardManagerInfo.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shardmanager/ShardManagerInfo.java
@@ -18,12 +18,6 @@ import org.opendaylight.controller.cluster.raft.RaftState;
 import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.opendaylight.controller.cluster.datastore.messages.AddShardReplica;
-import org.opendaylight.controller.cluster.datastore.messages.RemoveShardReplica;
-import akka.pattern.Patterns;
-import akka.util.Timeout;
-import java.util.concurrent.TimeUnit;
-import scala.concurrent.Await;
 
 public class ShardManagerInfo extends AbstractMXBean implements ShardManagerInfoMBean {
 
@@ -102,38 +96,4 @@ public class ShardManagerInfo extends AbstractMXBean implements ShardManagerInfo
     public void setShardManager(ShardManager shardManager){
         this.shardManager = shardManager;
     }
-
-    @Override
-    public void setAddShardReplica (String shardName) {
-        LOG.info ("addShardReplica initiated for shard {}", shardName);
-
-        // TODO addTimeout to be made configurable
-        Timeout addTimeOut = new Timeout(1, TimeUnit.MINUTES);
-        try {
-            Await.result(Patterns.ask(shardManager.getSelf(),
-                           new AddShardReplica(shardName), addTimeOut),
-                           addTimeOut.duration());
-        } catch (Exception ex) {
-            LOG.debug ("Obtained an exception during addShardReplica", ex);
-            throw (new RuntimeException(ex.getMessage()));
-        }
-        return;
-    }
-
-    @Override
-    public void setRemoveShardReplica (String shardName) {
-        LOG.info ("removeShardReplica initiated for shard {}", shardName);
-
-        // TODO remTimeOut to be made configurable
-        Timeout remTimeOut = new Timeout(30, TimeUnit.SECONDS);
-        try {
-            Await.result(Patterns.ask(shardManager.getSelf(),
-                           new RemoveShardReplica(shardName), remTimeOut),
-                           remTimeOut.duration());
-        } catch (Exception ex) {
-            LOG.debug ("Obtained an exception during removeShardReplica", ex);
-            throw (new RuntimeException(ex.getMessage()));
-        }
-        return;
-    }
 }

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shardmanager/ShardManagerInfoMBean.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shardmanager/ShardManagerInfoMBean.java
index 8660314b79541bac6a4a9692d1a12cf9ac75db1a..92a43d28f0d3e807e544822a3ec96d2e3762e8c7 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shardmanager/ShardManagerInfoMBean.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shardmanager/ShardManagerInfoMBean.java
@@ -52,19 +52,4 @@ public interface ShardManagerInfoMBean {
      *             the term provided when switching to a new Leader should always be higher than the previous term.
      */
     void switchShardState(String shardName, String newBehavior, long term);
-
-    /**
-     * Add a new Shard replica for an existing Shard in this controller node
-     *
-     * @param shardName the shard that is to be created and replicated in this controller instance
-     */
-    void setAddShardReplica (String shardName);
-
-    /**
-     * Remove a Shard replica available in this controller node
-     *
-     * @param shardName the shard that is to be removed from this controller instance
-     */
-    void setRemoveShardReplica (String shardName);
-
 }