You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by xt...@apache.org on 2022/01/26 02:04:55 UTC
[flink] branch master updated (7962a5d -> 19eb5f3)
This is an automated email from the ASF dual-hosted git repository.
xtsong pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.
from 7962a5d [FLINK-25668][runtime] Support to compute network memory for dynamic graph.
new d1b6cf6 [hotfix][dist] Include flink-gs-fs-hadoop into flink-dist
new 19eb5f3 [hotfix][fs][gs] Update serializer version.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
flink-dist/pom.xml | 17 +++++++++++++++++
flink-dist/src/main/assemblies/opt.xml | 7 +++++++
.../fs/gs/writer/GSCommitRecoverableSerializer.java | 4 ++--
.../fs/gs/writer/GSResumeRecoverableSerializer.java | 4 ++--
4 files changed, 28 insertions(+), 4 deletions(-)
[flink] 02/02: [hotfix][fs][gs] Update serializer version.
Posted by xt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xtsong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 19eb5f3e5d05745fe4423c165224fb35365f8172
Author: Xintong Song <to...@gmail.com>
AuthorDate: Tue Jan 25 10:40:55 2022 +0800
[hotfix][fs][gs] Update serializer version.
The purpose of this change is to prevent serialization/deserialization problems
between the PR and the final merged versions, as the PR has been opened for a
long time and we noticed it already have many users before being merged.
This commit should change nothing for new users of the officially merged version.
See the following discussion for more details:
https://github.com/apache/flink/pull/15599#issuecomment-1017633539
This closes #18409
---
.../org/apache/flink/fs/gs/writer/GSCommitRecoverableSerializer.java | 4 ++--
.../org/apache/flink/fs/gs/writer/GSResumeRecoverableSerializer.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/writer/GSCommitRecoverableSerializer.java b/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/writer/GSCommitRecoverableSerializer.java
index b92c49fd..58f1120 100644
--- a/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/writer/GSCommitRecoverableSerializer.java
+++ b/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/writer/GSCommitRecoverableSerializer.java
@@ -40,7 +40,7 @@ class GSCommitRecoverableSerializer implements SimpleVersionedSerializer<GSCommi
LoggerFactory.getLogger(GSCommitRecoverableSerializer.class);
/** Current version of serializer. */
- private static final int SERIALIZER_VERSION = 0;
+ private static final int SERIALIZER_VERSION = 1;
/** The one and only instance of the serializer. */
public static final GSCommitRecoverableSerializer INSTANCE =
@@ -133,7 +133,7 @@ class GSCommitRecoverableSerializer implements SimpleVersionedSerializer<GSCommi
@Override
public GSCommitRecoverable deserialize(int version, byte[] serialized) throws IOException {
- Preconditions.checkArgument(version >= 0);
+ Preconditions.checkArgument(version > 0);
Preconditions.checkNotNull(serialized);
// ensure this serializer can deserialize data with this version
diff --git a/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/writer/GSResumeRecoverableSerializer.java b/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/writer/GSResumeRecoverableSerializer.java
index d3120c4..3341aa4 100644
--- a/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/writer/GSResumeRecoverableSerializer.java
+++ b/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/writer/GSResumeRecoverableSerializer.java
@@ -37,7 +37,7 @@ class GSResumeRecoverableSerializer implements SimpleVersionedSerializer<GSResum
LoggerFactory.getLogger(GSResumeRecoverableSerializer.class);
/** Current version of serializer. */
- private static final int SERIALIZER_VERSION = 0;
+ private static final int SERIALIZER_VERSION = 1;
/** The one and only instance of the serializer. */
public static final GSResumeRecoverableSerializer INSTANCE =
@@ -83,7 +83,7 @@ class GSResumeRecoverableSerializer implements SimpleVersionedSerializer<GSResum
@Override
public GSResumeRecoverable deserialize(int version, byte[] serialized) throws IOException {
- Preconditions.checkArgument(version >= 0);
+ Preconditions.checkArgument(version > 0);
Preconditions.checkNotNull(serialized);
// ensure this serializer can deserialize data with this version
[flink] 01/02: [hotfix][dist] Include flink-gs-fs-hadoop into flink-dist
Posted by xt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xtsong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit d1b6cf652def2141507a50758ea1de258f2e1cc7
Author: Xintong Song <to...@gmail.com>
AuthorDate: Thu Jan 20 13:17:53 2022 +0800
[hotfix][dist] Include flink-gs-fs-hadoop into flink-dist
---
flink-dist/pom.xml | 17 +++++++++++++++++
flink-dist/src/main/assemblies/opt.xml | 7 +++++++
2 files changed, 24 insertions(+)
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index f949105..5a55d8f 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -423,6 +423,23 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
+ <artifactId>flink-gs-fs-hadoop</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <!--
+ Despite at provided scope, grpc artifacts can cause dependency resolving errors,
+ unstably, during javadoc aggregation.
+ -->
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
<artifactId>flink-queryable-state-runtime</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml
index 8320948..364151b 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -102,6 +102,13 @@
<fileMode>0644</fileMode>
</file>
+ <file>
+ <source>../flink-filesystems/flink-gs-fs-hadoop/target/flink-gs-fs-hadoop-${project.version}.jar</source>
+ <outputDirectory>opt/</outputDirectory>
+ <destName>flink-gs-fs-hadoop-${project.version}.jar</destName>
+ <fileMode>0644</fileMode>
+ </file>
+
<!-- Queryable State -->
<file>
<source>../flink-queryable-state/flink-queryable-state-runtime/target/flink-queryable-state-runtime-${project.version}.jar</source>