removing some TODOs
Change-Id: Ic98c811573a1b37813993eedddec512ec85729f3
diff --git a/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java b/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
index 1aa86c7..17647ac 100644
--- a/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
+++ b/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
@@ -296,7 +296,6 @@
@Override
public void event(ClusterEvent event) {
switch (event.type()) {
- //FIXME: worry about addition when the time comes
case INSTANCE_ADDED:
case INSTANCE_ACTIVATED:
clusterSize.incrementAndGet();
@@ -341,14 +340,9 @@
if (clusterService.getNodes().size() > (clusterSize.intValue() / 2)) {
return true;
}
-// else {
- //FIXME: break tie for equal-sized clusters, by number of
- // connected switches, then masters, then nodeId hash
- // problem is, how do we get at channel info cleanly here?
- // Also, what's the time hit for a distributed store look-up
- // versus channel re-negotiation? bet on the latter being worse.
-// }
+ //FIXME: break tie for equal-sized clusters,
+
return false;
}
diff --git a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
index 7879062..9805082 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
@@ -81,7 +81,6 @@
@Override
public IdGenerator getIdGenerator(String topic) {
- // FIXME this should be created lazily (once per topic)
IdBlockAllocator allocator = new StoreBasedIdBlockAllocator(topic, idBlockStore);
return new BlockAllocatorBasedIdGenerator(allocator);
}