You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2015/11/03 03:27:08 UTC
[07/50] [abbrv] incubator-apex-core git commit: APEX-159 #resolve Fix
application path in mini cluster test.
APEX-159 #resolve Fix application path in mini cluster test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/fb53705d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/fb53705d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/fb53705d
Branch: refs/heads/master
Commit: fb53705d928f18087675a1bfb8b45c9580129682
Parents: 0a89c83
Author: Thomas Weise <th...@datatorrent.com>
Authored: Sun Sep 27 16:08:00 2015 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Sun Sep 27 16:08:00 2015 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/stram/StramMiniClusterTest.java | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/fb53705d/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java b/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
index 493156b..f0fd325 100644
--- a/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
@@ -51,7 +51,6 @@ import com.sun.jersey.api.client.WebResource;
import com.datatorrent.api.*;
import com.datatorrent.api.Context.OperatorContext;
-import com.datatorrent.common.util.AsyncFSStorageAgent;
import com.datatorrent.stram.client.StramClientUtils;
import com.datatorrent.stram.client.StramClientUtils.YarnClientHelper;
import com.datatorrent.stram.engine.GenericTestOperator;
@@ -206,9 +205,6 @@ public class StramMiniClusterTest
LogicalPlanConfiguration tb = new LogicalPlanConfiguration(conf);
tb.addFromProperties(dagProps, null);
LogicalPlan dag = createDAG(tb);
- AsyncFSStorageAgent agent = new AsyncFSStorageAgent(testMeta.dir, null);
- agent.setSyncCheckpoint(true);
- dag.setAttribute(OperatorContext.STORAGE_AGENT, agent);
Configuration yarnConf = new Configuration(yarnCluster.getConfig());
StramClient client = new StramClient(yarnConf, dag);
try {
@@ -231,7 +227,7 @@ public class StramMiniClusterTest
private LogicalPlan createDAG(LogicalPlanConfiguration lpc) throws Exception
{
LogicalPlan dag = new LogicalPlan();
- dag.setAttribute(LogicalPlan.APPLICATION_PATH, "file:" + System.getProperty("user.dir") + "/" + testMeta.dir);
+ dag.setAttribute(LogicalPlan.APPLICATION_PATH, new File(testMeta.dir).toURI().toString());
lpc.prepareDAG(dag,null,"testApp");
dag.validate();
Assert.assertEquals("", Integer.valueOf(128), dag.getValue(DAG.MASTER_MEMORY_MB));
@@ -364,10 +360,7 @@ public class StramMiniClusterTest
{
LogicalPlan dag = new LogicalPlan();
- dag.setAttribute(LogicalPlan.APPLICATION_PATH, testMeta.dir);
- AsyncFSStorageAgent agent = new AsyncFSStorageAgent(testMeta.dir, null);
- agent.setSyncCheckpoint(true);
- dag.setAttribute(OperatorContext.STORAGE_AGENT, agent);
+ dag.setAttribute(LogicalPlan.APPLICATION_PATH, new File(testMeta.dir).toURI().toString());
FailingOperator badOperator = dag.addOperator("badOperator", FailingOperator.class);
dag.getContextAttributes(badOperator).put(OperatorContext.RECOVERY_ATTEMPTS, 1);