You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ratis.apache.org by dr...@apache.org on 2022/08/24 05:16:27 UTC
[ratis] branch branch-2 updated (87d7d0144 -> 533ea8293)
This is an automated email from the ASF dual-hosted git repository.
dragonyliu pushed a change to branch branch-2
in repository https://gitbox.apache.org/repos/asf/ratis.git
from 87d7d0144 RATIS-1638. Separate first election timeout (#713)
new 4e4dbfd5d RATIS-1683. Upgrade ubuntu version from 18.04 to 20.04 (#722)
new 16e83a236 RATIS-1682. Fix ratis make_rc.sh prepare-bin phase (#721)
new 491f85eee RATIS-1681. Use atomic_move to enhance robustness (#720)
new 533ea8293 RATIS-1684. Upgrade Ratis Thirdparty to 1.0.2 (#723)
The 4 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:
.github/workflows/post-commit.yml | 20 ++++++++++++--------
dev-support/make_rc.sh | 1 +
pom.xml | 4 ++--
.../main/java/org/apache/ratis/util/FileUtils.java | 10 ++++++++--
4 files changed, 23 insertions(+), 12 deletions(-)
[ratis] 01/04: RATIS-1683. Upgrade ubuntu version from 18.04 to 20.04 (#722)
Posted by dr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dragonyliu pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/ratis.git
commit 4e4dbfd5da79285004f46129b3a7bfef7618a36e
Author: Yaolong Liu <ly...@163.com>
AuthorDate: Mon Aug 22 23:08:40 2022 +0800
RATIS-1683. Upgrade ubuntu version from 18.04 to 20.04 (#722)
(cherry picked from commit 3568b8673521a585f5f6fa1918aa787b268ed9f6)
---
.github/workflows/post-commit.yml | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/post-commit.yml b/.github/workflows/post-commit.yml
index 1ea5ef00e..bdf37ba02 100644
--- a/.github/workflows/post-commit.yml
+++ b/.github/workflows/post-commit.yml
@@ -18,7 +18,7 @@ on:
- pull_request
jobs:
build:
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
steps:
- name: Checkout project
uses: actions/checkout@v2
@@ -48,7 +48,7 @@ jobs:
compile:
needs:
- build
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
strategy:
matrix:
java: [ 11 ]
@@ -80,7 +80,7 @@ jobs:
if: always()
rat:
name: rat
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@master
- name: Cache for maven dependencies
@@ -102,7 +102,7 @@ jobs:
if: always()
author:
name: author
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@master
- run: ./dev-support/checks/author.sh
@@ -113,7 +113,7 @@ jobs:
path: target/author
unit:
name: unit
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
strategy:
matrix:
profile:
@@ -150,7 +150,7 @@ jobs:
if: always()
checkstyle:
name: checkstyle
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@master
- name: Cache for maven dependencies
@@ -172,8 +172,12 @@ jobs:
if: always()
findbugs:
name: findbugs
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
steps:
+ - name: Setup java
+ uses: actions/setup-java@v1
+ with:
+ java-version: 8
- uses: actions/checkout@master
- name: Cache for maven dependencies
uses: actions/cache@v2
@@ -194,7 +198,7 @@ jobs:
if: always()
sonar:
name: sonar
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
if: (github.repository == 'apache/ratis' || github.repository == 'apache/incubator-ratis') && github.event_name != 'pull_request'
steps:
- uses: actions/checkout@master
[ratis] 02/04: RATIS-1682. Fix ratis make_rc.sh prepare-bin phase (#721)
Posted by dr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dragonyliu pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/ratis.git
commit 16e83a2367ef6c197ea66d4f7ddba3f798ac5206
Author: Yaolong Liu <ly...@163.com>
AuthorDate: Tue Aug 23 00:40:51 2022 +0800
RATIS-1682. Fix ratis make_rc.sh prepare-bin phase (#721)
(cherry picked from commit 07d6065cd8aa65a0fb09036da871aaef6175603e)
---
dev-support/make_rc.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-support/make_rc.sh b/dev-support/make_rc.sh
index a11dd9da2..e02145555 100755
--- a/dev-support/make_rc.sh
+++ b/dev-support/make_rc.sh
@@ -117,6 +117,7 @@ prepare-bin() {
mkdir -p "$WORKINGDIR"
cd "$WORKINGDIR"
tar zvxf "$projectdir/ratis-assembly/target/apache-ratis-${RATISVERSION}-src.tar.gz"
+ mv "apache-ratis-${RATISVERSION}-src" "apache-ratis-${RATISVERSION}"
cd "apache-ratis-${RATISVERSION}"
mvnFun clean install assembly:single -DskipTests=true -Prelease -Papache-release -Dgpg.keyname="${CODESIGNINGKEY}"
[ratis] 03/04: RATIS-1681. Use atomic_move to enhance robustness (#720)
Posted by dr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dragonyliu pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/ratis.git
commit 491f85eeeab192f55d25b270f78e459ee62e954e
Author: William Song <48...@users.noreply.github.com>
AuthorDate: Wed Aug 24 07:42:21 2022 +0800
RATIS-1681. Use atomic_move to enhance robustness (#720)
(cherry picked from commit 8267e87ac42bb32323555e18db1a11dd6d930a6b)
---
.../src/main/java/org/apache/ratis/util/FileUtils.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/ratis-common/src/main/java/org/apache/ratis/util/FileUtils.java b/ratis-common/src/main/java/org/apache/ratis/util/FileUtils.java
index 28a6cc197..40a51e9f9 100644
--- a/ratis-common/src/main/java/org/apache/ratis/util/FileUtils.java
+++ b/ratis-common/src/main/java/org/apache/ratis/util/FileUtils.java
@@ -76,9 +76,15 @@ public interface FileUtils {
}
static void move(Path src, Path dst) throws IOException {
- LogUtils.runAndLog(LOG,
+ try {
+ LogUtils.runAndLog(LOG,
+ () -> Files.move(src, dst, StandardCopyOption.ATOMIC_MOVE),
+ () -> "Atomic Files.move " + src + " to " + dst);
+ } catch (AtomicMoveNotSupportedException e) {
+ LogUtils.runAndLog(LOG,
() -> Files.move(src, dst),
- () -> "Files.move " + src + " to " + dst);
+ () -> "Atomic move not supported. Fallback to Files.move " + src + " to " + dst);
+ }
}
/**
[ratis] 04/04: RATIS-1684. Upgrade Ratis Thirdparty to 1.0.2 (#723)
Posted by dr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dragonyliu pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/ratis.git
commit 533ea82936d1fba9c574189a3cd699e9bba02620
Author: Yaolong Liu <ly...@163.com>
AuthorDate: Wed Aug 24 10:57:17 2022 +0800
RATIS-1684. Upgrade Ratis Thirdparty to 1.0.2 (#723)
(cherry picked from commit d205e8264ce73578c78ed5d5a78e4255d274492a)
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index ffffe82e3..55a75c723 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,11 +205,11 @@
<maven.min.version>3.3.9</maven.min.version>
<!-- Contains all shaded thirdparty dependencies -->
- <ratis.thirdparty.version>1.0.1</ratis.thirdparty.version>
+ <ratis.thirdparty.version>1.0.2</ratis.thirdparty.version>
<!-- Need these for the protobuf compiler. *MUST* match what is in ratis-thirdparty -->
<shaded.protobuf.version>3.19.2</shaded.protobuf.version>
- <shaded.grpc.version>1.44.0</shaded.grpc.version>
+ <shaded.grpc.version>1.48.1</shaded.grpc.version>
<!-- Test properties -->
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>