You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2017/07/24 09:08:49 UTC

[1/2] flink git commit: [hotfix] Add trace logging to state object discarding

Repository: flink
Updated Branches:
  refs/heads/release-1.3 618d54449 -> ab28c8e84


[hotfix] Add trace logging to state object discarding


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

Branch: refs/heads/release-1.3
Commit: 9416357a4f91afe2c2388ae10b71477608ed905a
Parents: 618d544
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Fri Jul 21 18:43:39 2017 +0200
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Mon Jul 24 11:05:37 2017 +0200

----------------------------------------------------------------------
 .../org/apache/flink/runtime/checkpoint/CompletedCheckpoint.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/9416357a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CompletedCheckpoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CompletedCheckpoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CompletedCheckpoint.java
index 7c3edee..56aa19d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CompletedCheckpoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CompletedCheckpoint.java
@@ -224,7 +224,9 @@ public class CompletedCheckpoint implements Serializable {
 
 			// discard private state objects
 			try {
-				StateUtil.bestEffortDiscardAllStateObjects(operatorStates.values());
+				Collection<OperatorState> values = operatorStates.values();
+				LOG.trace("About to discard operator states {}.", values);
+				StateUtil.bestEffortDiscardAllStateObjects(values);
 			} catch (Exception e) {
 				exception = ExceptionUtils.firstOrSuppressed(e, exception);
 			}


[2/2] flink git commit: [FLINK-7211] [build] Exclude Gelly javadoc jar from release

Posted by al...@apache.org.
[FLINK-7211] [build] Exclude Gelly javadoc jar from release


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

Branch: refs/heads/release-1.3
Commit: ab28c8e84b593a434c880f2e823cf29c826c6f96
Parents: 9416357
Author: Greg Hogan <co...@greghogan.com>
Authored: Mon Jul 17 05:30:21 2017 -0400
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Mon Jul 24 11:07:39 2017 +0200

----------------------------------------------------------------------
 flink-dist/src/main/assemblies/bin.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/ab28c8e8/flink-dist/src/main/assemblies/bin.xml
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml
index 8f758d0..abe7647 100644
--- a/flink-dist/src/main/assemblies/bin.xml
+++ b/flink-dist/src/main/assemblies/bin.xml
@@ -188,12 +188,8 @@ under the License.
 			<outputDirectory>examples/gelly</outputDirectory>
 			<fileMode>0644</fileMode>
 			<includes>
-				<include>*.jar</include>
+				<include>flink-gelly-examples_2.10-${project.version}.jar</include>
 			</includes>
-			<excludes>
-				<exclude>original-*.jar</exclude>
-				<exclude>*-tests.jar</exclude>
-			</excludes>
 		</fileSet>
 
 		<!-- copy python package -->