summaryrefslogtreecommitdiffstats
path: root/gearman
diff options
context:
space:
mode:
authorSebastian Wagner2011-09-05 15:24:17 +0200
committerSebastian Wagner2011-09-05 15:24:17 +0200
commitc050c638d0c8475241ceccf33ee22df1f01181be (patch)
treebfc4364c08382cc85af18854885da1dc2b7c4635 /gearman
parenteventResize- and eventDrop Function added (diff)
downloadpoolctrl-c050c638d0c8475241ceccf33ee22df1f01181be.tar.gz
poolctrl-c050c638d0c8475241ceccf33ee22df1f01181be.tar.xz
poolctrl-c050c638d0c8475241ceccf33ee22df1f01181be.zip
rename eventStates
Diffstat (limited to 'gearman')
-rw-r--r--gearman/controllerWorker/ControllerWorker/Boot.java38
-rw-r--r--gearman/controllerWorker/ControllerWorker/Client.java2
-rw-r--r--gearman/controllerWorker/ControllerWorker/ClientState.java56
-rw-r--r--gearman/controllerWorker/ControllerWorker/Shutdown.java27
4 files changed, 65 insertions, 58 deletions
diff --git a/gearman/controllerWorker/ControllerWorker/Boot.java b/gearman/controllerWorker/ControllerWorker/Boot.java
index 5ad54e1..56adce6 100644
--- a/gearman/controllerWorker/ControllerWorker/Boot.java
+++ b/gearman/controllerWorker/ControllerWorker/Boot.java
@@ -123,12 +123,12 @@ public class Boot extends Thread {
for (Client client : clients) {
switch (client.getState()) {
- case CLIENT_INITIALIZED:
+ case CLIENT_UNKNOWN:
ping(client);
break;
- case PING_INITIALIZED:
+ case CHECK_PING_PROGRESS:
GearmanJob pingJob = pingJobs.get(client.getId());
if (pingJob != null) {
GearmanJobStatus jobStatus = gearmanClient
@@ -174,7 +174,7 @@ public class Boot extends Thread {
break;
- case WAKE_ON_LAN_INITIALIZED:
+ case CHECK_WAKE_ON_LAN_PROGRESS:
GearmanJob wolJob = wolJobs.get(client.getId());
if (wolJob != null) {
GearmanJobStatus jobStatus = gearmanClient
@@ -213,7 +213,7 @@ public class Boot extends Thread {
break;
- case PING_WOL_INITIALIZED:
+ case CHECK_PING_WOL_PROGRESS:
GearmanJob pingJobWoL = pingWoLJobs.get(client.getId());
if (pingJobWoL != null) {
Date currentDate = new Date();
@@ -263,7 +263,7 @@ public class Boot extends Thread {
break;
- case CHECKOS_INITIALIZED:
+ case CHECK_CHECKOS_PROGRESS:
GearmanJob osJob = osJobs.get(client.getId());
if (osJob != null) {
@@ -313,7 +313,7 @@ public class Boot extends Thread {
break;
- case WHO_INITIALIZED:
+ case CHECK_WHO_PROGRESS:
GearmanJob whoJob = whoJobs.get(client.getId());
if (whoJob != null) {
@@ -368,7 +368,7 @@ public class Boot extends Thread {
break;
- case PS_INITIALIZED:
+ case CHECK_PS_PROGRESS:
GearmanJob psJob = psJobs.get(client.getId());
if (psJob != null) {
@@ -435,7 +435,7 @@ public class Boot extends Thread {
break;
- case RESTART_INITIALIZED:
+ case CHECK_RESTART_PROGRESS:
GearmanJob restartJob = restartJobs.get(client.getId());
if (restartJob != null) {
GearmanJobStatus jobStatus = gearmanClient.getJobStatus(restartJob);
@@ -475,7 +475,7 @@ public class Boot extends Thread {
break;
- case PING_RESTART_SHUTDOWN_INITIALIZED:
+ case CHECK_PING_RESTART_SHUTDOWN_PROGRESS:
GearmanJob pingJobRestartShutdown = pingRestartShutdownJobs.get(client.getId());
if (pingJobRestartShutdown != null) {
Date currentDate = new Date();
@@ -546,7 +546,7 @@ public class Boot extends Thread {
break;
- case PING_RESTART_BOOT_INITIALIZED:
+ case CHECK_PING_RESTART_BOOT_PROGRESS:
GearmanJob pingJobRestartBoot = pingRestartBootJobs.get(client
.getId());
if (pingJobRestartBoot != null) {
@@ -651,7 +651,7 @@ public class Boot extends Thread {
GearmanJob job = GearmanJobImpl.createJob("ping", client.getIp()
.getBytes(), "ping" + client.getId());
gearmanClient.submit(job);
- client.setState(ClientState.PING_INITIALIZED);
+ client.setState(ClientState.CHECK_PING_PROGRESS);
pingJobs.put(client.getId(), job);
logger.info("ping " + client.getIp());
}
@@ -660,7 +660,7 @@ public class Boot extends Thread {
GearmanJob job = GearmanJobImpl.createJob("ping", client.getIp()
.getBytes(), "ping" + client.getId());
gearmanClient.submit(job);
- client.setState(ClientState.PING_WOL_INITIALIZED);
+ client.setState(ClientState.CHECK_PING_WOL_PROGRESS);
pingWoLJobs.put(client.getId(), job);
logger.info("ping " + client.getIp());
}
@@ -669,7 +669,7 @@ public class Boot extends Thread {
GearmanJob job = GearmanJobImpl.createJob("ping", client.getIp()
.getBytes(), "ping" + client.getId());
gearmanClient.submit(job);
- client.setState(ClientState.PING_RESTART_SHUTDOWN_INITIALIZED);
+ client.setState(ClientState.CHECK_PING_RESTART_SHUTDOWN_PROGRESS);
pingRestartShutdownJobs.put(client.getId(), job);
logger.info("ping " + client.getIp());
}
@@ -678,7 +678,7 @@ public class Boot extends Thread {
GearmanJob job = GearmanJobImpl.createJob("ping", client.getIp()
.getBytes(), "ping" + client.getId());
gearmanClient.submit(job);
- client.setState(ClientState.PING_RESTART_BOOT_INITIALIZED);
+ client.setState(ClientState.CHECK_PING_RESTART_BOOT_PROGRESS);
pingRestartBootJobs.put(client.getId(), job);
logger.info("ping " + client.getIp());
}
@@ -687,7 +687,7 @@ public class Boot extends Thread {
GearmanJob job = GearmanJobImpl.createJob("wol", client.getMac()
.getBytes(), "wol" + client.getId());
gearmanClient.submit(job);
- client.setState(ClientState.WAKE_ON_LAN_INITIALIZED);
+ client.setState(ClientState.CHECK_WAKE_ON_LAN_PROGRESS);
wolJobs.put(client.getId(), job);
logger.info("wake on lan " + client.getMac());
}
@@ -696,7 +696,7 @@ public class Boot extends Thread {
GearmanJob job = GearmanJobImpl.createJob("os", client.getIp()
.getBytes(), "os" + client.getId());
gearmanClient.submit(job);
- client.setState(ClientState.CHECKOS_INITIALIZED);
+ client.setState(ClientState.CHECK_CHECKOS_PROGRESS);
osJobs.put(client.getId(), job);
logger.info("check OS " + client.getIp());
}
@@ -705,7 +705,7 @@ public class Boot extends Thread {
GearmanJob job = GearmanJobImpl.createJob("who", client.getIp()
.getBytes(), "who" + client.getId());
gearmanClient.submit(job);
- client.setState(ClientState.WHO_INITIALIZED);
+ client.setState(ClientState.CHECK_WHO_PROGRESS);
whoJobs.put(client.getId(), job);
logger.info("who " + client.getIp());
}
@@ -714,7 +714,7 @@ public class Boot extends Thread {
GearmanJob job = GearmanJobImpl.createJob("ps", client.getIp()
.getBytes(), "ps" + client.getId());
gearmanClient.submit(job);
- client.setState(ClientState.PS_INITIALIZED);
+ client.setState(ClientState.CHECK_PS_PROGRESS);
psJobs.put(client.getId(), job);
logger.info("ps " + client.getIp());
}
@@ -723,7 +723,7 @@ public class Boot extends Thread {
GearmanJob job = GearmanJobImpl.createJob("restart", client.getIp()
.getBytes(), "restart" + client.getId());
gearmanClient.submit(job);
- client.setState(ClientState.RESTART_INITIALIZED);
+ client.setState(ClientState.CHECK_RESTART_PROGRESS);
restartJobs.put(client.getId(), job);
logger.info("restart " + client.getIp());
}
diff --git a/gearman/controllerWorker/ControllerWorker/Client.java b/gearman/controllerWorker/ControllerWorker/Client.java
index b47104e..4fae67a 100644
--- a/gearman/controllerWorker/ControllerWorker/Client.java
+++ b/gearman/controllerWorker/ControllerWorker/Client.java
@@ -17,7 +17,7 @@ public class Client {
finished = false;
error = "";
//initializeState(initialStateText);
- setState(ClientState.CLIENT_INITIALIZED);
+ setState(ClientState.CLIENT_UNKNOWN);
}
public int getId() {
diff --git a/gearman/controllerWorker/ControllerWorker/ClientState.java b/gearman/controllerWorker/ControllerWorker/ClientState.java
index bb78d90..1615efb 100644
--- a/gearman/controllerWorker/ControllerWorker/ClientState.java
+++ b/gearman/controllerWorker/ControllerWorker/ClientState.java
@@ -1,22 +1,24 @@
package ControllerWorker;
public enum ClientState {
- //initialisation states
- CLIENT_INITIALIZED(1),
- PING_INITIALIZED(2),
- CLIENT_IS_ALIVE(3),
- WHO_INITIALIZED(4),
- SHUTDOWN_INITIALIZED(5),
- PING_SHUTDOWN_INITIALIZED(6),
- WAKE_ON_LAN_INITIALIZED(7),
- CHECKOS_INITIALIZED(8),
- PS_INITIALIZED(9),
- PING_WOL_INITIALIZED(10),
- RESTART_INITIALIZED(11),
- PING_RESTART_SHUTDOWN_INITIALIZED(12),
- PING_RESTART_BOOT_INITIALIZED(13),
+ //initialisation state
+ CLIENT_UNKNOWN(1),
+
+ //progress states
+ CHECK_PING_PROGRESS(2),
+ CHECK_WHO_PROGRESS(3),
+ CHECK_SHUTDOWN_PROGRESS(4),
+ CHECK_PING_SHUTDOWN_PROGRESS(5),
+ CHECK_WAKE_ON_LAN_PROGRESS(6),
+ CHECK_CHECKOS_PROGRESS(7),
+ CHECK_PS_PROGRESS(8),
+ CHECK_PING_WOL_PROGRESS(9),
+ CHECK_RESTART_PROGRESS(10),
+ CHECK_PING_RESTART_SHUTDOWN_PROGRESS(11),
+ CHECK_PING_RESTART_BOOT_PROGRESS(12),
- //other states
+ //job states
+ CLIENT_IS_ALIVE(13),
SHUTDOWN_CLIENT(14),
SHUTDOWN_COMMAND_SENT(15),
PING_SHUTDOWN_AGAIN(16),
@@ -48,27 +50,27 @@ public enum ClientState {
@Override
public String toString() {
switch (this) {
- case CLIENT_INITIALIZED:
+ case CLIENT_UNKNOWN:
return "[" + this.state + "] The client has been intialized.";
- case PING_INITIALIZED:
+ case CHECK_PING_PROGRESS:
return "[" + this.state + "] The ping has been intialized.";
case CLIENT_IS_ALIVE:
return "[" + this.state + "] The client is alive.";
- case WHO_INITIALIZED:
+ case CHECK_WHO_PROGRESS:
return "[" + this.state + "] The check if a user is logged in has been intialized.";
case SHUTDOWN_CLIENT:
return "[" + this.state + "] No user is logged in.";
- case SHUTDOWN_INITIALIZED:
+ case CHECK_SHUTDOWN_PROGRESS:
return "[" + this.state + "] A shutdown of the client has been triggered.";
case SHUTDOWN_COMMAND_SENT:
return "[" + this.state + "] The shutdown command has been sent.";
case PING_SHUTDOWN_AGAIN:
return "[" + this.state + "] Doing ping after shutdown again and again, until client is not alive or waitTime has been elapsed";
- case PING_SHUTDOWN_INITIALIZED:
+ case CHECK_PING_SHUTDOWN_PROGRESS:
return "[" + this.state + "] The ping after shutdown has been intialized.";
case USER_IS_LOGGED_IN:
return "[" + this.state + "] A user is logged in.";
- case PS_INITIALIZED:
+ case CHECK_PS_PROGRESS:
return "[" + this.state + "] The check if the user is working has been intialized.";
case USER_IS_WORKING:
return "[" + this.state + "] The user is working.";
@@ -78,15 +80,15 @@ public enum ClientState {
return "[" + this.state + "] Shutdown of the client has been finished.";
case CLIENT_NOT_ALIVE:
return "[" + this.state + "] The client is not alive.";
- case WAKE_ON_LAN_INITIALIZED:
+ case CHECK_WAKE_ON_LAN_PROGRESS:
return "[" + this.state + "] The wake on LAN has been initialized.";
case MAGIC_PACKET_SENT:
return "[" + this.state + "] The Magic packet has been sent.";
case PING_WOL_AGAIN:
return "[" + this.state + "] Doing ping after wake on LAN again and again, until client is alive or waitTime has been elapsed";
- case PING_WOL_INITIALIZED:
+ case CHECK_PING_WOL_PROGRESS:
return "[" + this.state + "] The ping after wake on LAN has been initialized.";
- case CHECKOS_INITIALIZED:
+ case CHECK_CHECKOS_PROGRESS:
return "[" + this.state + "] The check for the correct operating system has been initialized.";
case WRONG_OS:
return "[" + this.state + "] The wrong operating system is running.";
@@ -94,19 +96,19 @@ public enum ClientState {
return "[" + this.state + "] A user is logged in.";
case RESTART_CLIENT:
return "[" + this.state + "] No user is logged in.";
- case RESTART_INITIALIZED:
+ case CHECK_RESTART_PROGRESS:
return "[" + this.state + "] A restart of the client has been initialized.";
case RESTART_COMMAND_SENT:
return "[" + this.state + "] The restart command has been sent.";
case PING_RESTART_SHUTDOWN_AGAIN:
return "[" + this.state + "] Doing ping after shutdown again and again, until client is not alive or waitTime has been elapsed";
- case PING_RESTART_SHUTDOWN_INITIALIZED:
+ case CHECK_PING_RESTART_SHUTDOWN_PROGRESS:
return "[" + this.state + "] The ping after shutdown has been initialized.";
case CLIENT_IS_DOWN:
return "[" + this.state + "] The client has been shutted down.";
case PING_RESTART_BOOT_AGAIN:
return "[" + this.state + "] Doing ping after reboot again and again, until client is not alive or waitTime has been elapsed";
- case PING_RESTART_BOOT_INITIALIZED:
+ case CHECK_PING_RESTART_BOOT_PROGRESS:
return "[" + this.state + "] The ping after reboot has been initialized.";
default:
return "[" + this.state + "] Client is in unknown State";
diff --git a/gearman/controllerWorker/ControllerWorker/Shutdown.java b/gearman/controllerWorker/ControllerWorker/Shutdown.java
index b8f55b8..0b6d598 100644
--- a/gearman/controllerWorker/ControllerWorker/Shutdown.java
+++ b/gearman/controllerWorker/ControllerWorker/Shutdown.java
@@ -105,12 +105,13 @@ public class Shutdown extends Thread {
for (Client client : clients) {
switch (client.getState()) {
- case CLIENT_INITIALIZED:
+ case CLIENT_UNKNOWN:
ping(client);
break;
- case PING_INITIALIZED:
+ case CHECK_PING_PROGRESS:
+ //checkPingProgress();
GearmanJob pingJob = pingJobs.get(client.getId());
if (pingJob != null) {
@@ -155,7 +156,7 @@ public class Shutdown extends Thread {
break;
- case WHO_INITIALIZED:
+ case CHECK_WHO_PROGRESS:
GearmanJob whoJob = whoJobs.get(client.getId());
if (whoJob != null) {
@@ -210,7 +211,7 @@ public class Shutdown extends Thread {
break;
- case SHUTDOWN_INITIALIZED:
+ case CHECK_SHUTDOWN_PROGRESS:
GearmanJob doShutdownJob = doShutdownJobs.get(client.getId());
if (doShutdownJob != null) {
GearmanJobStatus jobStatus = gearmanClient
@@ -254,7 +255,7 @@ public class Shutdown extends Thread {
break;
- case PING_SHUTDOWN_INITIALIZED:
+ case CHECK_PING_SHUTDOWN_PROGRESS:
GearmanJob pingJobShutdown = pingShutdownJobs.get(client.getId());
if (pingJobShutdown != null) {
Date currentDate = new Date();
@@ -310,7 +311,7 @@ public class Shutdown extends Thread {
break;
- case PS_INITIALIZED:
+ case CHECK_PS_PROGRESS:
GearmanJob psJob = psJobs.get(client.getId());
if (psJob != null) {
@@ -421,16 +422,20 @@ public class Shutdown extends Thread {
GearmanJob job = GearmanJobImpl.createJob("ping",
client.getIp().getBytes(), "ping" + client.getId());
gearmanClient.submit(job);
- client.setState(ClientState.PING_INITIALIZED);
+ client.setState(ClientState.CHECK_PING_PROGRESS);
pingJobs.put(client.getId(), job);
logger.info("ping " + client.getIp());
}
+ private void checkPingProgress() {
+
+ }
+
private void who(Client client) {
GearmanJob job = GearmanJobImpl.createJob("who", client.getIp().getBytes(),
"who" + client.getId());
gearmanClient.submit(job);
- client.setState(ClientState.WHO_INITIALIZED);
+ client.setState(ClientState.CHECK_WHO_PROGRESS);
whoJobs.put(client.getId(), job);
logger.info("who " + client.getIp());
}
@@ -439,7 +444,7 @@ public class Shutdown extends Thread {
GearmanJob job = GearmanJobImpl.createJob("doShutdown", client.getIp()
.getBytes(), "doShutdown" + client.getId());
gearmanClient.submit(job);
- client.setState(ClientState.SHUTDOWN_INITIALIZED);
+ client.setState(ClientState.CHECK_SHUTDOWN_PROGRESS);
doShutdownJobs.put(client.getId(), job);
logger.info("doShutdown " + client.getIp());
}
@@ -448,7 +453,7 @@ public class Shutdown extends Thread {
GearmanJob job = GearmanJobImpl.createJob("ping",
client.getIp().getBytes(), "ping" + client.getId());
gearmanClient.submit(job);
- client.setState(ClientState.PING_SHUTDOWN_INITIALIZED);
+ client.setState(ClientState.CHECK_PING_SHUTDOWN_PROGRESS);
pingShutdownJobs.put(client.getId(), job);
logger.info("ping " + client.getIp());
}
@@ -457,7 +462,7 @@ public class Shutdown extends Thread {
GearmanJob job = GearmanJobImpl.createJob("ps", client.getIp().getBytes(),
"ps" + client.getId());
gearmanClient.submit(job);
- client.setState(ClientState.PS_INITIALIZED);
+ client.setState(ClientState.CHECK_PS_PROGRESS);
psJobs.put(client.getId(), job);
logger.info("ps " + client.getIp());
}