You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dj...@apache.org on 2016/05/10 20:11:16 UTC
[1/3] incubator-quarks git commit: Add state change to JobMXBean
Repository: incubator-quarks
Updated Branches:
refs/heads/master edd17a331 -> b6877ccba
Add state change to JobMXBean
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/4e50a18d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/4e50a18d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/4e50a18d
Branch: refs/heads/master
Commit: 4e50a18df66bb120c62cca031da6d3b9b4c63a29
Parents: fa48c5f
Author: Dan Debrunner <dj...@debrunners.com>
Authored: Mon May 9 06:41:39 2016 -0700
Committer: Dan Debrunner <dj...@debrunners.com>
Committed: Mon May 9 06:42:49 2016 -0700
----------------------------------------------------------------------
.../src/main/java/quarks/execution/mbeans/JobMXBean.java | 11 +++++++++++
.../java/quarks/runtime/etiao/mbeans/EtiaoJobBean.java | 5 +++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/4e50a18d/api/execution/src/main/java/quarks/execution/mbeans/JobMXBean.java
----------------------------------------------------------------------
diff --git a/api/execution/src/main/java/quarks/execution/mbeans/JobMXBean.java b/api/execution/src/main/java/quarks/execution/mbeans/JobMXBean.java
index f1bc5e9..7386537 100644
--- a/api/execution/src/main/java/quarks/execution/mbeans/JobMXBean.java
+++ b/api/execution/src/main/java/quarks/execution/mbeans/JobMXBean.java
@@ -18,6 +18,8 @@ under the License.
*/
package quarks.execution.mbeans;
+import quarks.execution.Job.Action;
+
/**
* Control interface for a job.
*/
@@ -150,4 +152,13 @@ public interface JobMXBean {
* @return a JSON-formatted string representing the running graph.
*/
String graphSnapshot();
+
+ /**
+ * Initiates an execution state change.
+ *
+ * @param action which triggers the state change.
+ * @throws IllegalArgumentException if the job is not in an appropriate
+ * state for the requested action, or the action is not supported.
+ */
+ void stateChange(Action action);
}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/4e50a18d/runtime/etiao/src/main/java/quarks/runtime/etiao/mbeans/EtiaoJobBean.java
----------------------------------------------------------------------
diff --git a/runtime/etiao/src/main/java/quarks/runtime/etiao/mbeans/EtiaoJobBean.java b/runtime/etiao/src/main/java/quarks/runtime/etiao/mbeans/EtiaoJobBean.java
index 69ae5ce..4e66d1d 100644
--- a/runtime/etiao/src/main/java/quarks/runtime/etiao/mbeans/EtiaoJobBean.java
+++ b/runtime/etiao/src/main/java/quarks/runtime/etiao/mbeans/EtiaoJobBean.java
@@ -21,6 +21,7 @@ package quarks.runtime.etiao.mbeans;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import quarks.execution.Job.Action;
import quarks.execution.mbeans.JobMXBean;
import quarks.runtime.etiao.EtiaoJob;
import quarks.runtime.etiao.graph.model.GraphType;
@@ -69,4 +70,8 @@ public class EtiaoJobBean implements JobMXBean {
public String getLastError() {
return job.getLastError();
}
+ @Override
+ public void stateChange(Action action) {
+ job.stateChange(action);
+ }
}
[3/3] incubator-quarks git commit: Merge branch 'pr-112'
Posted by dj...@apache.org.
Merge branch 'pr-112'
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/b6877ccb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/b6877ccb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/b6877ccb
Branch: refs/heads/master
Commit: b6877ccba6bacb17ff22103ef1288f5e18a081bc
Parents: edd17a3 372f225
Author: Daniel J. Debrunner <de...@us.ibm.com>
Authored: Tue May 10 13:07:38 2016 -0700
Committer: Daniel J. Debrunner <de...@us.ibm.com>
Committed: Tue May 10 13:07:38 2016 -0700
----------------------------------------------------------------------
.../main/java/quarks/execution/mbeans/JobMXBean.java | 11 +++++++++++
.../java/quarks/runtime/appservice/AppService.java | 6 ++++++
.../quarks/runtime/etiao/mbeans/EtiaoJobBean.java | 5 +++++
.../runtime/jsoncontrol/JsonControlService.java | 15 +++++++++++++++
.../samples/scenarios/iotf/IotfFullScenario.java | 2 +-
5 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] incubator-quarks git commit: Add some trace infor for the app &
control services
Posted by dj...@apache.org.
Add some trace infor for the app & control services
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/372f2258
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/372f2258
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/372f2258
Branch: refs/heads/master
Commit: 372f2258df021f2d26f09964f6161f1a78dd3069
Parents: 4e50a18
Author: Dan Debrunner <dj...@debrunners.com>
Authored: Mon May 9 16:07:50 2016 -0700
Committer: Dan Debrunner <dj...@debrunners.com>
Committed: Mon May 9 16:07:50 2016 -0700
----------------------------------------------------------------------
.../java/quarks/runtime/appservice/AppService.java | 6 ++++++
.../runtime/jsoncontrol/JsonControlService.java | 15 +++++++++++++++
.../samples/scenarios/iotf/IotfFullScenario.java | 2 +-
3 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/372f2258/runtime/appservice/src/main/java/quarks/runtime/appservice/AppService.java
----------------------------------------------------------------------
diff --git a/runtime/appservice/src/main/java/quarks/runtime/appservice/AppService.java b/runtime/appservice/src/main/java/quarks/runtime/appservice/AppService.java
index 5b26f6c..ce674ff 100644
--- a/runtime/appservice/src/main/java/quarks/runtime/appservice/AppService.java
+++ b/runtime/appservice/src/main/java/quarks/runtime/appservice/AppService.java
@@ -24,6 +24,9 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.gson.JsonObject;
import quarks.execution.DirectSubmitter;
@@ -48,6 +51,8 @@ import quarks.topology.services.ApplicationService;
*/
public class AppService implements ApplicationService {
+ private static final Logger logger = LoggerFactory.getLogger(ApplicationService.class);
+
/**
* Create an register an application service using the default alias {@link ApplicationService#ALIAS}.
* @param provider Provider to create topology instances for registered applications.
@@ -91,6 +96,7 @@ public class AppService implements ApplicationService {
@Override
public void registerTopology(String applicationName, BiConsumer<Topology, JsonObject> builder) {
+ logger.trace("Register application name: {}", applicationName);
applications.put(applicationName, builder);
}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/372f2258/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
----------------------------------------------------------------------
diff --git a/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java b/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
index 44622e6..c0b48d0 100644
--- a/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
+++ b/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
@@ -24,6 +24,9 @@ import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
@@ -41,6 +44,8 @@ import quarks.execution.services.Controls;
* a work in progress.
*/
public class JsonControlService implements ControlService {
+
+ private static final Logger logger = LoggerFactory.getLogger(ControlService.class);
/**
* Key for the type of the control MBean in a JSON request.
@@ -112,6 +117,7 @@ public class JsonControlService implements ControlService {
if (mbeans.containsKey(controlId))
throw new IllegalStateException();
+ logger.trace("Register control id: {}", controlId);
mbeans.put(controlId, new ControlMBean<T>(controlInterface, control));
return controlId;
}
@@ -121,6 +127,7 @@ public class JsonControlService implements ControlService {
*/
@Override
public synchronized void unregister(String controlId) {
+ logger.trace("Unegister control id: {}", controlId);
mbeans.remove(controlId);
}
@@ -135,6 +142,8 @@ public class JsonControlService implements ControlService {
final String type = request.get(TYPE_KEY).getAsString();
String alias = request.get(ALIAS_KEY).getAsString();
final String controlId = getControlId(type, null, alias);
+
+ logger.trace("Operation - control id: {}", controlId);
ControlMBean<?> mbean;
synchronized (this) {
@@ -146,6 +155,8 @@ public class JsonControlService implements ControlService {
String methodName = request.get(OP_KEY).getAsString();
+ logger.trace("Operation method - control id: {} method: {}", controlId, methodName);
+
int argumentCount = 0;
JsonArray args = null;
if (request.has(ARGS_KEY)) {
@@ -159,7 +170,11 @@ public class JsonControlService implements ControlService {
if (method == null)
return new JsonPrimitive(Boolean.FALSE);
+ logger.trace("Execute operation - control id: {} method: {}", controlId, methodName);
+
executeMethod(method, mbean.getControl(), getArguments(method, args));
+
+ logger.trace("Execute completed - control id: {} method: {}", controlId, methodName);
return new JsonPrimitive(Boolean.TRUE);
}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/372f2258/samples/scenarios/src/main/java/quarks/samples/scenarios/iotf/IotfFullScenario.java
----------------------------------------------------------------------
diff --git a/samples/scenarios/src/main/java/quarks/samples/scenarios/iotf/IotfFullScenario.java b/samples/scenarios/src/main/java/quarks/samples/scenarios/iotf/IotfFullScenario.java
index f1cd408..3e0b6ac 100644
--- a/samples/scenarios/src/main/java/quarks/samples/scenarios/iotf/IotfFullScenario.java
+++ b/samples/scenarios/src/main/java/quarks/samples/scenarios/iotf/IotfFullScenario.java
@@ -71,7 +71,7 @@ public class IotfFullScenario {
registerDisplay(provider);
// Start this provider
- // the two applications will not start
+ // the three applications will not start
provider.start();
}