홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
c53411ed 1 parent 48ee992f

DatabaseManager: removing Raft Member management code 

Change-Id: Id7d773459e40e0ad51fa56026465b067f09b5b92
Inline Side-by-side
Showing 1 changed file with 5 additions and 7 deletions
...@@ -125,9 +125,6 @@ public class DatabaseManager implements DatabaseService, DatabaseAdminService { ...@@ -125,9 +125,6 @@ public class DatabaseManager implements DatabaseService, DatabaseAdminService {
125 125
126 126
127 StateMachine stateMachine = new DatabaseStateMachine(); 127 StateMachine stateMachine = new DatabaseStateMachine();
128 - // Chronicle + OSGi issue
129 - //Log consensusLog = new ChronicleLog(LOG_FILE_PREFIX + "_" + thisNode.id());
130 - //Log consensusLog = new KryoRegisteredInMemoryLog();
131 Log consensusLog = new MapDBLog(LOG_FILE_PREFIX + localNode.id(), 128 Log consensusLog = new MapDBLog(LOG_FILE_PREFIX + localNode.id(),
132 ClusterMessagingProtocol.SERIALIZER); 129 ClusterMessagingProtocol.SERIALIZER);
133 130
...@@ -247,10 +244,11 @@ public class DatabaseManager implements DatabaseService, DatabaseAdminService { ...@@ -247,10 +244,11 @@ public class DatabaseManager implements DatabaseService, DatabaseAdminService {
247 break; 244 break;
248 case INSTANCE_DEACTIVATED: 245 case INSTANCE_DEACTIVATED:
249 case INSTANCE_REMOVED: 246 case INSTANCE_REMOVED:
250 - log.info("{} was removed from the cluster", tcpMember); 247 + // FIXME to be replaced with admin interface
251 - synchronized (clusterConfig) { 248 +// log.info("{} was removed from the cluster", tcpMember);
252 - clusterConfig.removeRemoteMember(tcpMember); 249 +// synchronized (clusterConfig) {
253 - } 250 +// clusterConfig.removeRemoteMember(tcpMember);
251 +// }
254 break; 252 break;
255 default: 253 default:
256 break; 254 break;
......