Skip to content

Commit

Permalink
move/revert cluster management calls to HttpPostCommandProcessor
Browse files Browse the repository at this point in the history
  • Loading branch information
@hasancelik
hasancelik committed Sep 20, 2018
1 parent 595a219 commit 87c64ff
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 154 deletions.
81 changes: 0 additions & 81 deletions hazelcast/src/main/java/com/hazelcast/internal/ascii/rest/HttpCommandProcessor.java
View file
Expand Up @@ -109,85 +109,4 @@ public void handleListNodes(HttpCommand command) {
}
sendResponse(textCommandService, command, res);
}

public void handleClusterShutdown(HttpCommand command) {
String res;
try {
Node node = textCommandService.getNode();
ClusterService clusterService = node.getClusterService();
res = response(RestUtil.ResponseType.SUCCESS);
sendResponse(textCommandService, command, res);
clusterService.shutdown();
return;
} catch (Throwable throwable) {
logger.warning("Error occurred while shutting down cluster", throwable);
res = exceptionResponse(throwable);
}
sendResponse(textCommandService, command, res);
}

public void handleShutdownNode(HttpCommand command) {
String res;
try {
Node node = textCommandService.getNode();
res = response(RestUtil.ResponseType.SUCCESS);
sendResponse(textCommandService, command, res);
node.hazelcastInstance.shutdown();
return;
} catch (Throwable throwable) {
logger.warning("Error occurred while shutting down", throwable);
res = exceptionResponse(throwable);
}
sendResponse(textCommandService, command, res);
}

public void handleForceStart(HttpCommand command) {
String res;
try {
Node node = textCommandService.getNode();
boolean success = node.getNodeExtension().getInternalHotRestartService().triggerForceStart();
res = response(success ? RestUtil.ResponseType.SUCCESS : RestUtil.ResponseType.FAIL);
} catch (Throwable throwable) {
logger.warning("Error occurred while handling force start", throwable);
res = exceptionResponse(throwable);
}
sendResponse(textCommandService, command, res);
}

public void handlePartialStart(HttpCommand command) {
String res;
try {
Node node = textCommandService.getNode();
boolean success = node.getNodeExtension().getInternalHotRestartService().triggerPartialStart();
res = response(success ? RestUtil.ResponseType.SUCCESS : RestUtil.ResponseType.FAIL);
} catch (Throwable throwable) {
logger.warning("Error occurred while handling partial start", throwable);
res = exceptionResponse(throwable);
}
sendResponse(textCommandService, command, res);
}

public void handleHotRestartBackup(HttpCommand command) {
String res;
try {
textCommandService.getNode().getNodeExtension().getHotRestartService().backup();
res = response(RestUtil.ResponseType.SUCCESS);
} catch (Throwable throwable) {
logger.warning("Error occurred while invoking hot backup", throwable);
res = exceptionResponse(throwable);
}
sendResponse(textCommandService, command, res);
}

public void handleHotRestartBackupInterrupt(HttpCommand command) {
String res;
try {
textCommandService.getNode().getNodeExtension().getHotRestartService().interruptBackupTask();
res = response(RestUtil.ResponseType.SUCCESS);
} catch (Throwable throwable) {
logger.warning("Error occurred while interrupting hot backup", throwable);
res = exceptionResponse(throwable);
}
sendResponse(textCommandService, command, res);
}
}
13 changes: 0 additions & 13 deletions hazelcast/src/main/java/com/hazelcast/internal/ascii/rest/HttpGetCommandProcessor.java
View file
Expand Up @@ -68,19 +68,6 @@ public void handle(HttpGetCommand command) {
handleGetClusterVersion(command);
} else if (uri.startsWith(URI_CLUSTER_STATE_URL)) {
handleGetClusterState(command);
} else if (uri.startsWith(URI_FORCESTART_CLUSTER_URL)) {
handleForceStart(command);
} else if (uri.startsWith(URI_PARTIALSTART_CLUSTER_URL)) {
handlePartialStart(command);
} else if (uri.startsWith(URI_HOT_RESTART_BACKUP_CLUSTER_URL)) {
handleHotRestartBackup(command);
} else if (uri.startsWith(URI_HOT_RESTART_BACKUP_INTERRUPT_CLUSTER_URL)) {
handleHotRestartBackupInterrupt(command);
} else if (uri.startsWith(URI_SHUTDOWN_NODE_CLUSTER_URL)) {
handleShutdownNode(command);
} else if (uri.startsWith(URI_SHUTDOWN_CLUSTER_URL)) {
handleClusterShutdown(command);
return;
} else if (uri.startsWith(URI_CLUSTER_NODES_URL)) {
handleListNodes(command);
} else {
Expand Down
161 changes: 107 additions & 54 deletions hazelcast/src/main/java/com/hazelcast/internal/ascii/rest/HttpPostCommandProcessor.java
View file
Expand Up @@ -27,10 +27,7 @@
import com.hazelcast.internal.management.dto.WanReplicationConfigDTO;
import com.hazelcast.internal.management.operation.AddWanConfigOperation;
import com.hazelcast.internal.management.request.UpdatePermissionConfigRequest;
<<<<<<< HEAD
=======
import com.hazelcast.internal.util.rest.RestUtil;
>>>>>>> removed group-name & convert POST methods have not param into GET
import com.hazelcast.logging.ILogger;
import com.hazelcast.security.SecurityService;
import com.hazelcast.spi.InternalCompletableFuture;
Expand Down Expand Up @@ -87,16 +84,16 @@ public void handle(HttpPostCommand command) {
handleWanClearQueues(command);
} else if (uri.startsWith(URI_ADD_WAN_CONFIG) || uri.startsWith(LEGACY_URI_ADD_WAN_CONFIG)) {
handleAddWanConfig(command);
} else if (uri.startsWith(URI_WAN_PAUSE_PUBLISHER)) {
handleWanPausePublisher(command);
} else if (uri.startsWith(URI_WAN_STOP_PUBLISHER)) {
handleWanStopPublisher(command);
} else if (uri.startsWith(URI_WAN_RESUME_PUBLISHER)) {
handleWanResumePublisher(command);
} else if (uri.startsWith(URI_WAN_CONSISTENCY_CHECK_MAP)) {
handleWanConsistencyCheck(command);
} else if (uri.startsWith(URI_UPDATE_PERMISSIONS)) {
handleUpdatePermissions(command);
/**
* The below handle methods are moved to HttpCommandProcessor to use them at {@link #HttpGetCommandProcessor}
* so these else-if blocks are @Deprecated.
* We are keeping them for backward-compatible by linking functionality(allowing both GET & POST)
* These blocks will be removed with future releases.
*/
} else if (uri.startsWith(URI_CLUSTER_STATE_URL)) {
handleGetClusterState(command);
} else if (uri.startsWith(URI_SHUTDOWN_CLUSTER_URL)) {
handleClusterShutdown(command);
return;
Expand All @@ -108,28 +105,18 @@ public void handle(HttpPostCommand command) {
handleHotRestartBackup(command);
} else if (uri.startsWith(URI_PARTIALSTART_CLUSTER_URL)) {
handlePartialStart(command);
} else if (uri.startsWith(URI_CLUSTER_NODES_URL)) {
handleListNodes(command);
} else if (uri.startsWith(URI_SHUTDOWN_NODE_CLUSTER_URL)) {
handleShutdownNode(command);
} else if (uri.startsWith(URI_WAN_SYNC_MAP) || uri.startsWith(LEGACY_URI_WAN_SYNC_MAP)) {
handleWanSyncMap(command);
} else if (uri.startsWith(URI_WAN_SYNC_ALL_MAPS) || uri.startsWith(LEGACY_URI_WAN_SYNC_ALL_MAPS)) {
handleWanSyncAllMaps(command);
} else if (uri.startsWith(URI_MANCENTER_WAN_CLEAR_QUEUES) || uri.startsWith(LEGACY_URI_MANCENTER_WAN_CLEAR_QUEUES)) {
handleWanClearQueues(command);
} else if (uri.startsWith(URI_ADD_WAN_CONFIG) || uri.startsWith(LEGACY_URI_ADD_WAN_CONFIG)) {
handleAddWanConfig(command);
} else if (uri.startsWith(URI_WAN_PAUSE_PUBLISHER)) {
handleWanPausePublisher(command);
} else if (uri.startsWith(URI_WAN_STOP_PUBLISHER)) {
handleWanStopPublisher(command);
} else if (uri.startsWith(URI_WAN_RESUME_PUBLISHER)) {
handleWanResumePublisher(command);
} else if (uri.startsWith(URI_WAN_CONSISTENCY_CHECK_MAP)) {
handleWanConsistencyCheck(command);
} else if (uri.startsWith(URI_UPDATE_PERMISSIONS)) {
handleUpdatePermissions(command);
/**
* The below handle methods are moved to HttpCommandProcessor to use them at {@link #HttpGetCommandProcessor}
* so these else-if blocks are @Deprecated.
* We are keeping them for backward-compatible by linking functionality(allowing both GET & POST)
* These blocks will be removed with future releases.
*/
} else if (uri.startsWith(URI_CLUSTER_STATE_URL)) {
handleGetClusterState(command);
} else if (uri.startsWith(URI_CLUSTER_NODES_URL)) {
handleListNodes(command);
} else {
command.setResponse(HttpCommand.RES_400);
}
Expand Down Expand Up @@ -179,6 +166,87 @@ private void handleChangeClusterVersion(HttpPostCommand command) throws Unsuppor
command.setResponse(HttpCommand.CONTENT_TYPE_JSON, stringToBytes(res));
}

public void handleClusterShutdown(HttpPostCommand command) {
String res;
try {
Node node = textCommandService.getNode();
ClusterService clusterService = node.getClusterService();
res = response(RestUtil.ResponseType.SUCCESS);
sendResponse(textCommandService, command, res);
clusterService.shutdown();
return;
} catch (Throwable throwable) {
logger.warning("Error occurred while shutting down cluster", throwable);
res = exceptionResponse(throwable);
}
sendResponse(textCommandService, command, res);
}

public void handleShutdownNode(HttpPostCommand command) {
String res;
try {
Node node = textCommandService.getNode();
res = response(RestUtil.ResponseType.SUCCESS);
sendResponse(textCommandService, command, res);
node.hazelcastInstance.shutdown();
return;
} catch (Throwable throwable) {
logger.warning("Error occurred while shutting down", throwable);
res = exceptionResponse(throwable);
}
sendResponse(textCommandService, command, res);
}

public void handleForceStart(HttpPostCommand command) {
String res;
try {
Node node = textCommandService.getNode();
boolean success = node.getNodeExtension().getInternalHotRestartService().triggerForceStart();
res = response(success ? RestUtil.ResponseType.SUCCESS : RestUtil.ResponseType.FAIL);
} catch (Throwable throwable) {
logger.warning("Error occurred while handling force start", throwable);
res = exceptionResponse(throwable);
}
sendResponse(textCommandService, command, res);
}

public void handlePartialStart(HttpPostCommand command) {
String res;
try {
Node node = textCommandService.getNode();
boolean success = node.getNodeExtension().getInternalHotRestartService().triggerPartialStart();
res = response(success ? RestUtil.ResponseType.SUCCESS : RestUtil.ResponseType.FAIL);
} catch (Throwable throwable) {
logger.warning("Error occurred while handling partial start", throwable);
res = exceptionResponse(throwable);
}
sendResponse(textCommandService, command, res);
}

public void handleHotRestartBackup(HttpPostCommand command) {
String res;
try {
textCommandService.getNode().getNodeExtension().getHotRestartService().backup();
res = response(RestUtil.ResponseType.SUCCESS);
} catch (Throwable throwable) {
logger.warning("Error occurred while invoking hot backup", throwable);
res = exceptionResponse(throwable);
}
sendResponse(textCommandService, command, res);
}

public void handleHotRestartBackupInterrupt(HttpPostCommand command) {
String res;
try {
textCommandService.getNode().getNodeExtension().getHotRestartService().interruptBackupTask();
res = response(RestUtil.ResponseType.SUCCESS);
} catch (Throwable throwable) {
logger.warning("Error occurred while interrupting hot backup", throwable);
res = exceptionResponse(throwable);
}
sendResponse(textCommandService, command, res);
}

private void handleQueue(HttpPostCommand command, String uri) {
String simpleValue = null;
String suffix;
Expand Down Expand Up @@ -254,13 +322,8 @@ private void handleWanSyncMap(HttpPostCommand command) throws UnsupportedEncodin
final String publisherId = params[1];
final String mapName = params[2];
try {
<<<<<<< HEAD
textCommandService.getNode().getNodeEngine().getWanReplicationService().syncMap(wanRepName, publisherId, mapName);
res = response(ResponseType.SUCCESS, "message", "Sync initiated");
=======
textCommandService.getNode().getNodeEngine().getWanReplicationService().syncMap(wanRepName, targetGroup, mapName);
res = response(RestUtil.ResponseType.SUCCESS, "message", "Sync initiated");
>>>>>>> removed group-name & convert POST methods have not param into GET
} catch (Exception ex) {
logger.warning("Error occurred while syncing map", ex);
res = exceptionResponse(ex);
Expand All @@ -283,13 +346,8 @@ private void handleWanSyncAllMaps(HttpPostCommand command) throws UnsupportedEnc
final String wanRepName = params[0];
final String publisherId = params[1];
try {
<<<<<<< HEAD
textCommandService.getNode().getNodeEngine().getWanReplicationService().syncAllMaps(wanRepName, publisherId);
res = response(ResponseType.SUCCESS, "message", "Sync initiated");
=======
textCommandService.getNode().getNodeEngine().getWanReplicationService().syncAllMaps(wanRepName, targetGroup);
res = response(RestUtil.ResponseType.SUCCESS, "message", "Sync initiated");
>>>>>>> removed group-name & convert POST methods have not param into GET
} catch (Exception ex) {
logger.warning("Error occurred while syncing maps", ex);
res = exceptionResponse(ex);
Expand All @@ -315,12 +373,12 @@ private void handleWanConsistencyCheck(HttpPostCommand command) throws Unsupport

try {
service.consistencyCheck(wanReplicationName, publisherId, mapName);
res = response(ResponseType.SUCCESS, "message", "Consistency check initiated");
res = response(RestUtil.ResponseType.SUCCESS, "message", "Consistency check initiated");
} catch (Exception ex) {
logger.warning("Error occurred while initiating consistency check", ex);
res = exceptionResponse(ex);
}
sendResponse(command, res);
sendResponse(textCommandService, command, res);
}

/**
Expand All @@ -337,13 +395,8 @@ private void handleWanClearQueues(HttpPostCommand command) throws UnsupportedEnc
final String wanRepName = params[0];
final String publisherId = params[1];
try {
<<<<<<< HEAD
textCommandService.getNode().getNodeEngine().getWanReplicationService().clearQueues(wanRepName, publisherId);
res = response(ResponseType.SUCCESS, "message", "WAN replication queues are cleared.");
=======
textCommandService.getNode().getNodeEngine().getWanReplicationService().clearQueues(wanRepName, targetGroup);
res = response(RestUtil.ResponseType.SUCCESS, "message", "WAN replication queues are cleared.");
>>>>>>> removed group-name & convert POST methods have not param into GET
} catch (Exception ex) {
logger.warning("Error occurred while clearing queues", ex);
res = exceptionResponse(ex);
Expand Down Expand Up @@ -405,12 +458,12 @@ private void handleWanPausePublisher(HttpPostCommand command) throws Unsupported

try {
service.pause(wanReplicationName, publisherId);
res = response(ResponseType.SUCCESS, "message", "WAN publisher paused");
res = response(RestUtil.ResponseType.SUCCESS, "message", "WAN publisher paused");
} catch (Exception ex) {
logger.warning("Error occurred while pausing WAN publisher", ex);
res = exceptionResponse(ex);
}
sendResponse(command, res);
sendResponse(textCommandService, command, res);
}

/**
Expand All @@ -432,12 +485,12 @@ private void handleWanStopPublisher(HttpPostCommand command) throws UnsupportedE

try {
service.stop(wanReplicationName, publisherId);
res = response(ResponseType.SUCCESS, "message", "WAN publisher stopped");
res = response(RestUtil.ResponseType.SUCCESS, "message", "WAN publisher stopped");
} catch (Exception ex) {
logger.warning("Error occurred while stopping WAN publisher", ex);
res = exceptionResponse(ex);
}
sendResponse(command, res);
sendResponse(textCommandService, command, res);
}

/**
Expand All @@ -459,12 +512,12 @@ private void handleWanResumePublisher(HttpPostCommand command) throws Unsupporte

try {
service.resume(wanReplicationName, publisherId);
res = response(ResponseType.SUCCESS, "message", "WAN publisher resumed");
res = response(RestUtil.ResponseType.SUCCESS, "message", "WAN publisher resumed");
} catch (Exception ex) {
logger.warning("Error occurred while resuming WAN publisher", ex);
res = exceptionResponse(ex);
}
sendResponse(command, res);
sendResponse(textCommandService, command, res);
}

private void handleUpdatePermissions(HttpPostCommand command) {
Expand Down

0 comments on commit 87c64ff

Please sign in to comment.