Skip to content

Commit

Permalink
(issue #29) logging
Browse files Browse the repository at this point in the history
  • Loading branch information
@bluestreak01
bluestreak01 committed Jan 29, 2015
1 parent c42e0f9 commit 7f9badf
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions nfsdb-core/src/main/java/com/nfsdb/net/cluster/ClusterController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import com.nfsdb.JournalWriter;
import com.nfsdb.exceptions.JournalNetworkException;
import com.nfsdb.exceptions.JournalRuntimeException;
import com.nfsdb.factory.JournalFactory;
import com.nfsdb.logging.Logger;
import com.nfsdb.net.JournalClient;
Expand Down Expand Up @@ -61,6 +62,7 @@ public void run() {
private final ExecutorService service;
private final ServerConfig serverConfig;
private final ClientConfig clientConfig;
private final ServerNode thisNode;
private JournalClient client;
private JournalServer server;

Expand Down Expand Up @@ -93,6 +95,11 @@ Thread newThread(@Nonnull Runnable r) {
return thread;
}
});

this.thisNode = serverConfig.getNode(instance);
if (thisNode == null) {
throw new JournalRuntimeException("Instance " + instance + " is not found in server config");
}
}

public void halt() throws JournalNetworkException {
Expand All @@ -115,6 +122,7 @@ public boolean isAlpha() {

public void start() {
if (running.compareAndSet(false, true)) {

service.submit(up);
}
}
Expand Down Expand Up @@ -152,13 +160,13 @@ private void haltClient() throws JournalNetworkException {
@SuppressWarnings("unchecked")
private void setupClient(ServerNode node) throws JournalNetworkException {

LOGGER.info(thisNode() + " Subscribing journals");
LOGGER.info("%s Subscribing journals", thisNode);
for (int i = 0, sz = writers.size(); i < sz; i++) {
JournalWriter w = writers.get(i);
client.subscribe(w.getKey(), w, null);
}

LOGGER.info(thisNode() + " Starting client");
LOGGER.info("%s Starting client", thisNode);
client.setDisconnectCallback(new JournalClient.DisconnectCallback() {
@Override
public void onDisconnect(JournalClient.DisconnectReason reason) {
Expand All @@ -170,20 +178,12 @@ public void onDisconnect(JournalClient.DisconnectReason reason) {
}).start();

if (listener != null) {
LOGGER.info(thisNode() + " Notifying callback of standby state");
LOGGER.info("%s Notifying callback of standby state", thisNode);
listener.onNodeStandingBy(node);
}

}

private ServerNode thisNode() {
ServerNode node = serverConfig.getNode(instance);
if (node == null) {
System.out.println("NULL node for " + instance);
}
return node;
}

private void vote(boolean startup) throws JournalNetworkException {

// this method can be called during both, standalone start and cluster re-vote
Expand All @@ -194,7 +194,7 @@ private void vote(boolean startup) throws JournalNetworkException {
ServerNode activeNode;
try {
if ((activeNode = getActiveNodeAndSetupClient()) != null) {
LOGGER.info(thisNode() + " There is active node already %s. Yielding", activeNode);
LOGGER.info("%s: there is active node already %s. Yielding", thisNode, activeNode);
setupClient(activeNode);
return;
}
Expand All @@ -206,8 +206,8 @@ private void vote(boolean startup) throws JournalNetworkException {
}

// scramble server to get noticed by other cluster controllers.
LOGGER.info(thisNode() + " Starting server");
server = new JournalServer(serverConfig, factory, null, thisNode().getId());
LOGGER.info("%s Starting server", thisNode);
server = new JournalServer(serverConfig, factory, null, thisNode.getId());

for (int i = 0, writersSize = writers.size(); i < writersSize; i++) {
server.publish(writers.get(i));
Expand Down Expand Up @@ -237,26 +237,26 @@ private void vote(boolean startup) throws JournalNetworkException {
}

client = new JournalClient(clientConfig, factory);
LOGGER.info("%s is probing %s", thisNode(), node);
LOGGER.info("%s is probing %s", thisNode, node);
JournalClient.VoteResult vote = client.voteInstance(instance, node);
LOGGER.info("%s got %s from %s", thisNode(), vote, node);
LOGGER.info("%s got %s from %s", thisNode, vote, node);
switch (vote) {
case ALPHA:
LOGGER.info(thisNode() + " Lost tie-break vote, becoming a client");
LOGGER.info("%s Lost tie-break to %s, becoming a client", thisNode, node);
server.halt();
// don't stop server explicitly, it wil shut down after being voted out
setupClient(node);
return;
case THEM:
LOGGER.info("%s lost tie-break against %s, wait for ALPHA node", thisNode(), node);
LOGGER.info("%s lost tie-break to %s, wait for ALPHA node", thisNode, node);
isClient = true;
server.halt();
break;
case ME_BY_DEFAULT:
LOGGER.info("%s WON by default against %s", thisNode(), node);
LOGGER.info("%s WON by default against %s", thisNode, node);
break;
default:
LOGGER.info("%s WON tie-break against %s", thisNode(), node);
LOGGER.info("%s WON tie-break against %s", thisNode, node);
nodesLeft = true;
}

Expand All @@ -269,7 +269,7 @@ private void vote(boolean startup) throws JournalNetworkException {
if (!isClient) {
// after this point server cannot be voted out and it becomes the ALPHA
server.setAlpha(true);
LOGGER.info(thisNode() + " Activating callback");
LOGGER.info("%s Activating callback", thisNode);
listener.onNodeActive();
return;
}
Expand All @@ -282,7 +282,7 @@ private void vote(boolean startup) throws JournalNetworkException {
throw new JournalNetworkException("Expected ALPHA node but got none");
}

LOGGER.info("%s is checking if %s has become ALPHA", thisNode(), activeNode);
LOGGER.info("%s is checking if %s has become ALPHA", thisNode, activeNode);
if (client.voteInstance(instance, activeNode) == JournalClient.VoteResult.ALPHA) {
setupClient(activeNode);
return;
Expand Down

0 comments on commit 7f9badf

Please sign in to comment.