tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject tez git commit: TEZ-2945. TEZ-2740 addendum to update API with currently supported parameters (bikas)
Date Wed, 18 Nov 2015 19:27:26 GMT
Repository: tez
Updated Branches:
  refs/heads/master 98706f271 -> e5e4fc7a0


TEZ-2945. TEZ-2740 addendum to update API with currently supported parameters (bikas)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/e5e4fc7a
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/e5e4fc7a
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/e5e4fc7a

Branch: refs/heads/master
Commit: e5e4fc7a0fc0dacc334d3cd36a686ba3c66c6a8b
Parents: 98706f2
Author: Bikas Saha <bikas@apache.org>
Authored: Wed Nov 18 11:26:46 2015 -0800
Committer: Bikas Saha <bikas@apache.org>
Committed: Wed Nov 18 11:26:46 2015 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                  | 2 ++
 .../org/apache/tez/dag/api/VertexManagerPluginContext.java   | 2 +-
 tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java | 5 +++++
 .../java/org/apache/tez/dag/app/dag/impl/VertexImpl.java     | 8 ++++++++
 .../java/org/apache/tez/dag/app/dag/impl/VertexManager.java  | 6 +++---
 5 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/e5e4fc7a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4163fa9..ff07cc0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,8 @@ INCOMPATIBLE CHANGES
   TEZ-2679. Admin forms of launch env settings
 
 ALL CHANGES:
+  TEZ-2945. TEZ-2740 addendum to update API with currently supported
+  parameters
   TEZ-2933. Tez UI: Load application details from RM when available
   TEZ-2908. Tez UI: Errors are logged, but not displayed in the UI when AM fetch fails
   TEZ-2923. Tez Live UI counters view empty for vertices, tasks, attempts

http://git-wip-us.apache.org/repos/asf/tez/blob/e5e4fc7a/tez-api/src/main/java/org/apache/tez/dag/api/VertexManagerPluginContext.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/VertexManagerPluginContext.java
b/tez-api/src/main/java/org/apache/tez/dag/api/VertexManagerPluginContext.java
index 242bcee..aa99745 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/VertexManagerPluginContext.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/VertexManagerPluginContext.java
@@ -202,7 +202,7 @@ public interface VertexManagerPluginContext {
    */
   public void reconfigureVertex(int parallelism,
       @Nullable VertexLocationHint locationHint,
-      @Nullable Map<String, EdgeManagerPluginDescriptor> sourceEdgeProperties,
+      @Nullable Map<String, EdgeProperty> sourceEdgeProperties,
       @Nullable Map<String, InputSpecUpdate> rootInputSpecUpdate);
   
   /**

http://git-wip-us.apache.org/repos/asf/tez/blob/e5e4fc7a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java
index d2801e6..60f5a8f 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java
@@ -115,6 +115,11 @@ public interface Vertex extends Comparable<Vertex> {
   public void reconfigureVertex(@Nullable Map<String, InputSpecUpdate> rootInputSpecUpdate,
       int parallelism,
       @Nullable VertexLocationHint locationHint) throws AMUserCodeException;
+  
+  public void reconfigureVertex(int parallelism,
+      @Nullable VertexLocationHint locationHint,
+      @Nullable Map<String, EdgeProperty> sourceEdgeProperties,
+      @Nullable Map<String, InputSpecUpdate> rootInputSpecUpdate) throws AMUserCodeException;
 
   void setVertexLocationHint(VertexLocationHint vertexLocationHint);
   void vertexReconfigurationPlanned();

http://git-wip-us.apache.org/repos/asf/tez/blob/e5e4fc7a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
index 3c6979b..5b75179 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
@@ -1698,6 +1698,14 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
EventHandl
   }
   
   @Override
+  public void reconfigureVertex(int parallelism,
+      @Nullable VertexLocationHint locationHint,
+      @Nullable Map<String, EdgeProperty> sourceEdgeProperties,
+      @Nullable Map<String, InputSpecUpdate> rootInputSpecUpdate) throws AMUserCodeException
{
+    setParallelism(parallelism, locationHint, sourceEdgeProperties, rootInputSpecUpdate,
false, true);
+  }
+  
+  @Override
   public void setParallelism(int parallelism, VertexLocationHint vertexLocationHint,
       Map<String, EdgeManagerPluginDescriptor> sourceEdgeManagers,
       Map<String, InputSpecUpdate> rootInputSpecUpdates, boolean fromVertexManager)


http://git-wip-us.apache.org/repos/asf/tez/blob/e5e4fc7a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java
index 32f7a42..379e316 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java
@@ -175,12 +175,12 @@ public class VertexManager {
     
     @Override
     public synchronized void reconfigureVertex(int parallelism, VertexLocationHint vertexLocationHint,
-        Map<String, EdgeManagerPluginDescriptor> sourceEdgeProperties,
+        Map<String, EdgeProperty> sourceEdgeProperties,
         Map<String, InputSpecUpdate> rootInputSpecUpdate) {
       checkAndThrowIfDone();
       try {
-        managedVertex.setParallelism(parallelism, vertexLocationHint, sourceEdgeProperties,
-            rootInputSpecUpdate, true);
+        managedVertex.reconfigureVertex(parallelism, vertexLocationHint, sourceEdgeProperties,
+            rootInputSpecUpdate);
       } catch (AMUserCodeException e) {
         throw new TezUncheckedException(e);
       }


Mime
View raw message