flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject [1/4] flink git commit: [FLINK-2097] temporarily disable session management API
Date Tue, 22 Sep 2015 19:57:17 GMT
Repository: flink
Updated Branches:
  refs/heads/master 7984acc6b -> d58caa8ec


[FLINK-2097] temporarily disable session management API


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

Branch: refs/heads/master
Commit: d58caa8ec88c348bef540cb5959d80bcf9bd894a
Parents: 71bf2f5
Author: Maximilian Michels <mxm@apache.org>
Authored: Tue Sep 15 15:21:20 2015 +0200
Committer: Maximilian Michels <mxm@apache.org>
Committed: Tue Sep 22 19:55:46 2015 +0200

----------------------------------------------------------------------
 .../org/apache/flink/api/java/ExecutionEnvironment.java  | 11 +++++++----
 .../java/org/apache/flink/api/java/LocalEnvironment.java |  6 ++++--
 .../org/apache/flink/api/java/RemoteEnvironment.java     |  6 ++++--
 3 files changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/d58caa8e/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java
b/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java
index 23b5a57..0f61d88 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java
@@ -277,10 +277,13 @@ public abstract class ExecutionEnvironment {
 	 * @param timeout The timeout, in seconds.
 	 */
 	public void setSessionTimeout(long timeout) {
-		if (timeout < 0) {
-			throw new IllegalArgumentException("The session timeout must not be less than zero.");
-		}
-		this.sessionTimeout = timeout;
+		throw new IllegalStateException("Support for sessions is currently disabled. " +
+				"It will be enabled in future Flink versions.");
+		// Session management is disabled, revert this commit to enable
+		//if (timeout < 0) {
+		//	throw new IllegalArgumentException("The session timeout must not be less than zero.");
+		//}
+		//this.sessionTimeout = timeout;
 	}
 
 	/**

http://git-wip-us.apache.org/repos/asf/flink/blob/d58caa8e/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java b/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java
index 5fd272b..7c85ed9 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java
@@ -78,8 +78,10 @@ public class LocalEnvironment extends ExecutionEnvironment {
 		}
 
 		Plan p = createProgramPlan(jobName);
-		p.setJobId(jobID);
-		p.setSessionTimeout(sessionTimeout);
+
+		// Session management is disabled, revert this commit to enable
+		//p.setJobId(jobID);
+		//p.setSessionTimeout(sessionTimeout);
 
 		JobExecutionResult result = executor.executePlan(p);
 

http://git-wip-us.apache.org/repos/asf/flink/blob/d58caa8e/flink-java/src/main/java/org/apache/flink/api/java/RemoteEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/RemoteEnvironment.java b/flink-java/src/main/java/org/apache/flink/api/java/RemoteEnvironment.java
index 6ae1f26..63f59d3 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/RemoteEnvironment.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/RemoteEnvironment.java
@@ -86,8 +86,10 @@ public class RemoteEnvironment extends ExecutionEnvironment {
 		ensureExecutorCreated();
 
 		Plan p = createProgramPlan(jobName);
-		p.setJobId(jobID);
-		p.setSessionTimeout(sessionTimeout);
+
+		// Session management is disabled, revert this commit to enable
+		//p.setJobId(jobID);
+		//p.setSessionTimeout(sessionTimeout);
 
 		JobExecutionResult result = executor.executePlan(p);
 


Mime
View raw message