From 40ebdd07602f534d476efbf5d0be9180b34df2dc Mon Sep 17 00:00:00 2001 From: jja725 Date: Fri, 7 Jun 2024 10:37:03 -0700 Subject: [PATCH 1/5] Fix metrics when delete non existing page ### What changes are proposed in this pull request? Fix metrics when delete non existing page ### Why are the changes needed? When deleting non-existing page we see a abnormal spike in PageAge. Still doesn't know why we have abnormal PageAge but since it's non-existing page we would not able to read it as well so it make sense to not record the age. Also we continue to delete page from page store if we didn't find it in metastore so we avoid inconsistency between pagestore and metastore ### Does this PR introduce any user facing changes? na pr-link: Alluxio/alluxio#18618 change-id: cid-7d4803cb2d8c433d3ad077a7bf9e3074d91b3389 --- .../client/file/cache/LocalCacheManager.java | 46 ++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/dora/core/client/fs/src/main/java/alluxio/client/file/cache/LocalCacheManager.java b/dora/core/client/fs/src/main/java/alluxio/client/file/cache/LocalCacheManager.java index 4874820581cc..d5c418ba2d9a 100644 --- a/dora/core/client/fs/src/main/java/alluxio/client/file/cache/LocalCacheManager.java +++ b/dora/core/client/fs/src/main/java/alluxio/client/file/cache/LocalCacheManager.java @@ -751,6 +751,50 @@ public boolean append(PageId pageId, int appendAt, byte[] page, CacheContext cac return put(pageId, page, cacheContext); } + /** + * delete the specified page. Be cautious that this method will return true if the page + * does not exist since the page already gone. + * + * @param info pageInfo + * @param isTemporary whether is it temporary or not + * @return whether the page is deleted successfully or not + */ + public boolean deletePageIfExists(PageInfo info, boolean isTemporary) { + if (mState.get() != READ_WRITE) { + Metrics.DELETE_NOT_READY_ERRORS.inc(); + Metrics.DELETE_ERRORS.inc(); + return false; + } + boolean ok = true; + ReadWriteLock pageLock = getPageLock(info.getPageId()); + try (LockResource r = new LockResource(pageLock.writeLock())) { + try (LockResource r1 = new LockResource(mPageMetaStore.getLock().writeLock())) { + try { + mPageMetaStore.removePage(info.getPageId(), isTemporary); + } catch (PageNotFoundException e) { + Metrics.DELETE_NON_EXISTING_PAGE_ERRORS.inc(); + Metrics.DELETE_ERRORS.inc(); + // pass through to delete the page from page store + } + } + try { + info.getLocalCacheDir().getPageStore().delete(info.getPageId(), isTemporary); + } catch (IOException e) { + LOG.error("Failed to delete page {} (isTemporary: {}) from pageStore.", + info.getPageId(), isTemporary, e); + ok = false; + Metrics.DELETE_STORE_DELETE_ERRORS.inc(); + Metrics.DELETE_ERRORS.inc(); + } catch (PageNotFoundException e) { + Metrics.DELETE_NON_EXISTING_PAGE_ERRORS.inc(); + Metrics.DELETE_ERRORS.inc(); + ok = true; + } + LOG.debug("delete({}) exits, success: {}", info.getPageId(), ok); + return ok; + } + } + /** * Restores a page store at the configured location, updating meta store accordingly. * If restore process fails, cleanup the location and create a new page store. @@ -921,7 +965,7 @@ public void invalidate(Predicate predicate) { PageInfo pageInfo = pageInfoOpt.get(); boolean isPageDeleted = false; if (predicate.test(pageInfo)) { - isPageDeleted = delete(pageInfo.getPageId()); + isPageDeleted = deletePageIfExists(pageInfo, false); } if (isPageDeleted) { MetricsSystem.meter(MetricKey.CLIENT_CACHE_PAGES_INVALIDATED.getName()).mark(); From 19aa8f0ce5b7f61cdba9ba24ce475b5419644357 Mon Sep 17 00:00:00 2001 From: Alluxio Bot Date: Fri, 7 Jun 2024 12:41:03 -0700 Subject: [PATCH 2/5] Update version to 313 --- assembly/client/pom.xml | 2 +- assembly/pom.xml | 2 +- assembly/server/pom.xml | 2 +- common/pom.xml | 2 +- common/transport/pom.xml | 2 +- docs/_config.yml | 4 ++-- dora/core/client/fs/pom.xml | 2 +- dora/core/client/hdfs/pom.xml | 2 +- dora/core/client/hdfs3/pom.xml | 2 +- dora/core/client/pom.xml | 2 +- dora/core/common/pom.xml | 2 +- dora/core/pom.xml | 2 +- dora/core/server/common/pom.xml | 2 +- dora/core/server/master/pom.xml | 2 +- dora/core/server/pom.xml | 2 +- dora/core/server/proxy/pom.xml | 2 +- dora/core/server/worker/pom.xml | 2 +- dora/examples/pom.xml | 2 +- dora/integration/fuse/pom.xml | 2 +- dora/integration/jnifuse/fs/pom.xml | 2 +- dora/integration/jnifuse/native/pom.xml | 2 +- dora/integration/jnifuse/pom.xml | 2 +- dora/integration/pom.xml | 2 +- dora/integration/tools/hms/pom.xml | 2 +- dora/integration/tools/pom.xml | 2 +- dora/integration/tools/validation/pom.xml | 2 +- dora/job/client/pom.xml | 2 +- dora/job/common/pom.xml | 2 +- dora/job/pom.xml | 2 +- dora/job/server/pom.xml | 2 +- dora/microbench/pom.xml | 2 +- dora/minicluster/pom.xml | 2 +- dora/pom.xml | 2 +- dora/shaded/client-hadoop3/pom.xml | 2 +- dora/shaded/client/pom.xml | 2 +- dora/shaded/hadoop/pom.xml | 2 +- dora/shaded/pom.xml | 2 +- dora/shell/pom.xml | 2 +- dora/stress/common/pom.xml | 2 +- dora/stress/pom.xml | 2 +- dora/stress/shell/pom.xml | 4 ++-- dora/tests/integration/pom.xml | 2 +- dora/tests/pom.xml | 2 +- dora/tests/testcontainers/pom.xml | 2 +- dora/underfs/abfs/pom.xml | 2 +- dora/underfs/adl/pom.xml | 2 +- dora/underfs/cephfs-hadoop/pom.xml | 2 +- dora/underfs/cephfs/pom.xml | 2 +- dora/underfs/cos/pom.xml | 2 +- dora/underfs/cosn/pom.xml | 2 +- dora/underfs/gcs/pom.xml | 2 +- dora/underfs/hdfs/pom.xml | 2 +- dora/underfs/local/pom.xml | 2 +- dora/underfs/obs/pom.xml | 2 +- dora/underfs/oss/pom.xml | 2 +- dora/underfs/ozone/pom.xml | 2 +- dora/underfs/pom.xml | 2 +- dora/underfs/s3a/pom.xml | 2 +- dora/underfs/wasb/pom.xml | 2 +- integration/dataproc/alluxio-dataproc.sh | 2 +- integration/docker/Dockerfile | 2 +- integration/docker/Dockerfile-dev | 2 +- integration/emr/alluxio-emr.sh | 2 +- native/pom.xml | 2 +- native/rust/archetype/pom.xml | 2 +- native/rust/pom.xml | 2 +- native/rust/rspdk/pom.xml | 2 +- pom.xml | 4 ++-- webui/pom.xml | 4 ++-- 69 files changed, 73 insertions(+), 73 deletions(-) diff --git a/assembly/client/pom.xml b/assembly/client/pom.xml index 77ee72a781a1..a46817e67d31 100644 --- a/assembly/client/pom.xml +++ b/assembly/client/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-assembly - 313-SNAPSHOT + 313 alluxio-assembly-client jar diff --git a/assembly/pom.xml b/assembly/pom.xml index b5c5e8acdbb7..3fa43f37ba31 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-parent - 313-SNAPSHOT + 313 alluxio-assembly pom diff --git a/assembly/server/pom.xml b/assembly/server/pom.xml index 0fdcf678b8f4..ebc80c33a76d 100644 --- a/assembly/server/pom.xml +++ b/assembly/server/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-assembly - 313-SNAPSHOT + 313 alluxio-assembly-server jar diff --git a/common/pom.xml b/common/pom.xml index 48dda8753116..2308cad1d456 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-parent - 313-SNAPSHOT + 313 alluxio-common pom diff --git a/common/transport/pom.xml b/common/transport/pom.xml index d48f4060ce3f..a8699eb1fafe 100644 --- a/common/transport/pom.xml +++ b/common/transport/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-common - 313-SNAPSHOT + 313 alluxio-core-transport jar diff --git a/docs/_config.yml b/docs/_config.yml index d8ed29db29e2..3ce4472e2c80 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -7,10 +7,10 @@ kramdown: # The full version string # Used to match the version string portion of file paths, URLs, and dependency versions # e.g. client jar path, -ALLUXIO_VERSION_STRING: 313-SNAPSHOT +ALLUXIO_VERSION_STRING: 313 # We must inline the version string (e.g., "1.4.0-SNAPSHOT") rather than using the macro of Alluxio version. # Otherwise the macro name remains in the output. -ALLUXIO_CLIENT_JAR_PATH: //client/alluxio-313-SNAPSHOT-client.jar +ALLUXIO_CLIENT_JAR_PATH: //client/alluxio-313-client.jar # For release branches, this should be the Alluxio version in the form of ., e.g. both 1.5.0 and 1.5.0-RC1 should use "1.5" # For master branch, this should be "edge" # This should be used to reference versioned pages that are not relative to the docs/ directory diff --git a/dora/core/client/fs/pom.xml b/dora/core/client/fs/pom.xml index 38c63144986d..471e08b48330 100644 --- a/dora/core/client/fs/pom.xml +++ b/dora/core/client/fs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core-client - 313-SNAPSHOT + 313 alluxio-core-client-fs jar diff --git a/dora/core/client/hdfs/pom.xml b/dora/core/client/hdfs/pom.xml index 405d38351db9..d5c33d71acfd 100644 --- a/dora/core/client/hdfs/pom.xml +++ b/dora/core/client/hdfs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core-client - 313-SNAPSHOT + 313 alluxio-core-client-hdfs jar diff --git a/dora/core/client/hdfs3/pom.xml b/dora/core/client/hdfs3/pom.xml index 7438a011dcf7..ed3f2e92a62f 100644 --- a/dora/core/client/hdfs3/pom.xml +++ b/dora/core/client/hdfs3/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core-client - 313-SNAPSHOT + 313 alluxio-core-client-hdfs3 jar diff --git a/dora/core/client/pom.xml b/dora/core/client/pom.xml index a76948a2bb21..d53e4558ecc6 100644 --- a/dora/core/client/pom.xml +++ b/dora/core/client/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core - 313-SNAPSHOT + 313 alluxio-core-client pom diff --git a/dora/core/common/pom.xml b/dora/core/common/pom.xml index 095c9bf51dfd..5cd253464951 100644 --- a/dora/core/common/pom.xml +++ b/dora/core/common/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core - 313-SNAPSHOT + 313 alluxio-core-common jar diff --git a/dora/core/pom.xml b/dora/core/pom.xml index 613fc1c7f6b1..fe5d828ffadb 100644 --- a/dora/core/pom.xml +++ b/dora/core/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313-SNAPSHOT + 313 alluxio-core pom diff --git a/dora/core/server/common/pom.xml b/dora/core/server/common/pom.xml index e5ab8502d47a..217fa368478f 100644 --- a/dora/core/server/common/pom.xml +++ b/dora/core/server/common/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core-server - 313-SNAPSHOT + 313 alluxio-core-server-common jar diff --git a/dora/core/server/master/pom.xml b/dora/core/server/master/pom.xml index df8b1e0203b3..f9db4b757bd3 100644 --- a/dora/core/server/master/pom.xml +++ b/dora/core/server/master/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core-server - 313-SNAPSHOT + 313 alluxio-core-server-master jar diff --git a/dora/core/server/pom.xml b/dora/core/server/pom.xml index da16b158075f..e24e63a6ba68 100644 --- a/dora/core/server/pom.xml +++ b/dora/core/server/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core - 313-SNAPSHOT + 313 alluxio-core-server pom diff --git a/dora/core/server/proxy/pom.xml b/dora/core/server/proxy/pom.xml index c072fb4f41ad..6805e31b64b0 100644 --- a/dora/core/server/proxy/pom.xml +++ b/dora/core/server/proxy/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core-server - 313-SNAPSHOT + 313 alluxio-core-server-proxy jar diff --git a/dora/core/server/worker/pom.xml b/dora/core/server/worker/pom.xml index e89721bd2de6..938aef7d6aab 100644 --- a/dora/core/server/worker/pom.xml +++ b/dora/core/server/worker/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core-server - 313-SNAPSHOT + 313 alluxio-core-server-worker jar diff --git a/dora/examples/pom.xml b/dora/examples/pom.xml index 75cd0bc0ea5a..ad0ee191a7a5 100644 --- a/dora/examples/pom.xml +++ b/dora/examples/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313-SNAPSHOT + 313 alluxio-examples jar diff --git a/dora/integration/fuse/pom.xml b/dora/integration/fuse/pom.xml index c2551684b72a..9155521a35e4 100644 --- a/dora/integration/fuse/pom.xml +++ b/dora/integration/fuse/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-integration - 313-SNAPSHOT + 313 alluxio-integration-fuse Alluxio Integration - FUSE diff --git a/dora/integration/jnifuse/fs/pom.xml b/dora/integration/jnifuse/fs/pom.xml index d1b1c231542f..190f1bed4a2f 100644 --- a/dora/integration/jnifuse/fs/pom.xml +++ b/dora/integration/jnifuse/fs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-integration-jnifuse - 313-SNAPSHOT + 313 alluxio-integration-jnifuse-fs diff --git a/dora/integration/jnifuse/native/pom.xml b/dora/integration/jnifuse/native/pom.xml index 4c09c5257fda..dc59eda9b970 100644 --- a/dora/integration/jnifuse/native/pom.xml +++ b/dora/integration/jnifuse/native/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-integration-jnifuse - 313-SNAPSHOT + 313 alluxio-integration-jnifuse-native diff --git a/dora/integration/jnifuse/pom.xml b/dora/integration/jnifuse/pom.xml index b364203a09aa..a5bdf6c1e874 100644 --- a/dora/integration/jnifuse/pom.xml +++ b/dora/integration/jnifuse/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-integration - 313-SNAPSHOT + 313 alluxio-integration-jnifuse pom diff --git a/dora/integration/pom.xml b/dora/integration/pom.xml index 022f5c794441..0845cae96ac4 100644 --- a/dora/integration/pom.xml +++ b/dora/integration/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313-SNAPSHOT + 313 alluxio-integration pom diff --git a/dora/integration/tools/hms/pom.xml b/dora/integration/tools/hms/pom.xml index a9bd3ff268d7..b5dbf10d947e 100644 --- a/dora/integration/tools/hms/pom.xml +++ b/dora/integration/tools/hms/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-integration-tools - 313-SNAPSHOT + 313 alluxio-integration-tools-hms diff --git a/dora/integration/tools/pom.xml b/dora/integration/tools/pom.xml index e934867f50e5..46ffce2ee2a1 100644 --- a/dora/integration/tools/pom.xml +++ b/dora/integration/tools/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-integration - 313-SNAPSHOT + 313 alluxio-integration-tools pom diff --git a/dora/integration/tools/validation/pom.xml b/dora/integration/tools/validation/pom.xml index 4ef84a834af2..00164d76f3d5 100644 --- a/dora/integration/tools/validation/pom.xml +++ b/dora/integration/tools/validation/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-integration-tools - 313-SNAPSHOT + 313 alluxio-integration-tools-validation jar diff --git a/dora/job/client/pom.xml b/dora/job/client/pom.xml index da13253cbc95..d73e52b2fd25 100644 --- a/dora/job/client/pom.xml +++ b/dora/job/client/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-job - 313-SNAPSHOT + 313 alluxio-job-client jar diff --git a/dora/job/common/pom.xml b/dora/job/common/pom.xml index fed7fcddefa7..c6dc661cd8a5 100644 --- a/dora/job/common/pom.xml +++ b/dora/job/common/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-job - 313-SNAPSHOT + 313 alluxio-job-common jar diff --git a/dora/job/pom.xml b/dora/job/pom.xml index cf1762878e71..cca74a3fa6bd 100644 --- a/dora/job/pom.xml +++ b/dora/job/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313-SNAPSHOT + 313 alluxio-job pom diff --git a/dora/job/server/pom.xml b/dora/job/server/pom.xml index b6db08ae6a5a..42adc1b99a49 100644 --- a/dora/job/server/pom.xml +++ b/dora/job/server/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-job - 313-SNAPSHOT + 313 alluxio-job-server jar diff --git a/dora/microbench/pom.xml b/dora/microbench/pom.xml index b016413c0ae8..9fc364124c67 100644 --- a/dora/microbench/pom.xml +++ b/dora/microbench/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313-SNAPSHOT + 313 alluxio-microbench jar diff --git a/dora/minicluster/pom.xml b/dora/minicluster/pom.xml index d643dcdd8ab5..1924b0422b96 100644 --- a/dora/minicluster/pom.xml +++ b/dora/minicluster/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313-SNAPSHOT + 313 alluxio-minicluster diff --git a/dora/pom.xml b/dora/pom.xml index f2d27506a6c3..497d5402e008 100644 --- a/dora/pom.xml +++ b/dora/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-parent - 313-SNAPSHOT + 313 alluxio-dora pom diff --git a/dora/shaded/client-hadoop3/pom.xml b/dora/shaded/client-hadoop3/pom.xml index 9793a2c58a40..4660d163df5f 100644 --- a/dora/shaded/client-hadoop3/pom.xml +++ b/dora/shaded/client-hadoop3/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-shaded - 313-SNAPSHOT + 313 alluxio-shaded-hadoop3-client jar diff --git a/dora/shaded/client/pom.xml b/dora/shaded/client/pom.xml index 763d61be7258..aad441b0da69 100644 --- a/dora/shaded/client/pom.xml +++ b/dora/shaded/client/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-shaded - 313-SNAPSHOT + 313 alluxio-shaded-client jar diff --git a/dora/shaded/hadoop/pom.xml b/dora/shaded/hadoop/pom.xml index 5bc0dc50f911..c4cbbe709254 100644 --- a/dora/shaded/hadoop/pom.xml +++ b/dora/shaded/hadoop/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-shaded - 313-SNAPSHOT + 313 alluxio-shaded-hadoop ${ufs.hadoop.version} diff --git a/dora/shaded/pom.xml b/dora/shaded/pom.xml index fe6229a5bf5e..b489bbd84c7b 100644 --- a/dora/shaded/pom.xml +++ b/dora/shaded/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313-SNAPSHOT + 313 alluxio-shaded pom diff --git a/dora/shell/pom.xml b/dora/shell/pom.xml index ae8fe891ed33..25abf480de64 100644 --- a/dora/shell/pom.xml +++ b/dora/shell/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313-SNAPSHOT + 313 alluxio-shell jar diff --git a/dora/stress/common/pom.xml b/dora/stress/common/pom.xml index 2cd2d532bd9c..afc49ff0c3a6 100644 --- a/dora/stress/common/pom.xml +++ b/dora/stress/common/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-stress - 313-SNAPSHOT + 313 alluxio-stress-common jar diff --git a/dora/stress/pom.xml b/dora/stress/pom.xml index 75894764e5e9..328720aac0d7 100644 --- a/dora/stress/pom.xml +++ b/dora/stress/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313-SNAPSHOT + 313 alluxio-stress pom diff --git a/dora/stress/shell/pom.xml b/dora/stress/shell/pom.xml index 5c6c6663f4c5..411fb1a11ebe 100644 --- a/dora/stress/shell/pom.xml +++ b/dora/stress/shell/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-stress - 313-SNAPSHOT + 313 alluxio-stress-shell jar @@ -57,7 +57,7 @@ org.alluxio alluxio-shell - 313-SNAPSHOT + 313 org.alluxio diff --git a/dora/tests/integration/pom.xml b/dora/tests/integration/pom.xml index 7e849b5e1338..c822f36d78c3 100644 --- a/dora/tests/integration/pom.xml +++ b/dora/tests/integration/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-tests - 313-SNAPSHOT + 313 alluxio-tests-integration jar diff --git a/dora/tests/pom.xml b/dora/tests/pom.xml index d04b20b1948c..c4f6ca1cbbd2 100644 --- a/dora/tests/pom.xml +++ b/dora/tests/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313-SNAPSHOT + 313 alluxio-tests pom diff --git a/dora/tests/testcontainers/pom.xml b/dora/tests/testcontainers/pom.xml index fc01629d3df0..b59b6383b1ad 100644 --- a/dora/tests/testcontainers/pom.xml +++ b/dora/tests/testcontainers/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-tests - 313-SNAPSHOT + 313 alluxio-tests-testcontainers jar diff --git a/dora/underfs/abfs/pom.xml b/dora/underfs/abfs/pom.xml index 01f948a539eb..764f093acd32 100644 --- a/dora/underfs/abfs/pom.xml +++ b/dora/underfs/abfs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313-SNAPSHOT + 313 alluxio-underfs-abfs Alluxio Under File System - Microsoft Azure DataLake Gen 2 diff --git a/dora/underfs/adl/pom.xml b/dora/underfs/adl/pom.xml index 67c8f7c126dd..1747bebaa8a4 100755 --- a/dora/underfs/adl/pom.xml +++ b/dora/underfs/adl/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313-SNAPSHOT + 313 alluxio-underfs-adl Alluxio Under File System - Microsoft Azure DataLake diff --git a/dora/underfs/cephfs-hadoop/pom.xml b/dora/underfs/cephfs-hadoop/pom.xml index 11c36a98b7b2..0f43ec64dd22 100644 --- a/dora/underfs/cephfs-hadoop/pom.xml +++ b/dora/underfs/cephfs-hadoop/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313-SNAPSHOT + 313 alluxio-underfs-cephfs-hadoop diff --git a/dora/underfs/cephfs/pom.xml b/dora/underfs/cephfs/pom.xml index 4747000d28d4..3f065758882b 100644 --- a/dora/underfs/cephfs/pom.xml +++ b/dora/underfs/cephfs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313-SNAPSHOT + 313 alluxio-underfs-cephfs Alluxio Under File System - CephFS diff --git a/dora/underfs/cos/pom.xml b/dora/underfs/cos/pom.xml index f4c558e53292..4df9a47348eb 100644 --- a/dora/underfs/cos/pom.xml +++ b/dora/underfs/cos/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313-SNAPSHOT + 313 alluxio-underfs-cos Alluxio Under File System - Tencent Cloud COS diff --git a/dora/underfs/cosn/pom.xml b/dora/underfs/cosn/pom.xml index 693c6da7090b..4b71b58052b5 100644 --- a/dora/underfs/cosn/pom.xml +++ b/dora/underfs/cosn/pom.xml @@ -17,7 +17,7 @@ org.alluxio alluxio-underfs - 313-SNAPSHOT + 313 alluxio-underfs-cosn diff --git a/dora/underfs/gcs/pom.xml b/dora/underfs/gcs/pom.xml index 723f6444ce1a..a03cabe11e34 100644 --- a/dora/underfs/gcs/pom.xml +++ b/dora/underfs/gcs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313-SNAPSHOT + 313 alluxio-underfs-gcs Alluxio Under File System - GCS diff --git a/dora/underfs/hdfs/pom.xml b/dora/underfs/hdfs/pom.xml index 23609c6d6b46..0adc0f3e2a6e 100644 --- a/dora/underfs/hdfs/pom.xml +++ b/dora/underfs/hdfs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313-SNAPSHOT + 313 alluxio-underfs-hdfs Alluxio Under File System - HDFS diff --git a/dora/underfs/local/pom.xml b/dora/underfs/local/pom.xml index 7207cc0203a0..6bb11d2cc761 100644 --- a/dora/underfs/local/pom.xml +++ b/dora/underfs/local/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313-SNAPSHOT + 313 alluxio-underfs-local Alluxio Under File System - Local FS diff --git a/dora/underfs/obs/pom.xml b/dora/underfs/obs/pom.xml index d0e76a736396..4f489cf8315b 100644 --- a/dora/underfs/obs/pom.xml +++ b/dora/underfs/obs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313-SNAPSHOT + 313 alluxio-underfs-obs Alluxio Under File System - Huawei OBS diff --git a/dora/underfs/oss/pom.xml b/dora/underfs/oss/pom.xml index a3ff7e2d3998..4e67f2f79c6c 100644 --- a/dora/underfs/oss/pom.xml +++ b/dora/underfs/oss/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313-SNAPSHOT + 313 alluxio-underfs-oss Alluxio Under File System - Aliyun OSS diff --git a/dora/underfs/ozone/pom.xml b/dora/underfs/ozone/pom.xml index 345723a23ebd..6aad89621907 100644 --- a/dora/underfs/ozone/pom.xml +++ b/dora/underfs/ozone/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313-SNAPSHOT + 313 alluxio-underfs-ozone diff --git a/dora/underfs/pom.xml b/dora/underfs/pom.xml index 20bd49b959f6..48b137557f1d 100755 --- a/dora/underfs/pom.xml +++ b/dora/underfs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313-SNAPSHOT + 313 alluxio-underfs pom diff --git a/dora/underfs/s3a/pom.xml b/dora/underfs/s3a/pom.xml index cf514cac00be..00b60975b2ea 100644 --- a/dora/underfs/s3a/pom.xml +++ b/dora/underfs/s3a/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313-SNAPSHOT + 313 alluxio-underfs-s3a Alluxio Under File System - S3 diff --git a/dora/underfs/wasb/pom.xml b/dora/underfs/wasb/pom.xml index 131a318633bd..166233082ab5 100644 --- a/dora/underfs/wasb/pom.xml +++ b/dora/underfs/wasb/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313-SNAPSHOT + 313 alluxio-underfs-wasb Alluxio Under File System - Microsoft Azure Blob Storage diff --git a/integration/dataproc/alluxio-dataproc.sh b/integration/dataproc/alluxio-dataproc.sh index c94f3eb4955b..94510ae6a923 100755 --- a/integration/dataproc/alluxio-dataproc.sh +++ b/integration/dataproc/alluxio-dataproc.sh @@ -23,7 +23,7 @@ readonly SPARK_HOME="${SPARK_HOME:-"/usr/lib/spark"}" readonly HIVE_HOME="${HIVE_HOME:-"/usr/lib/hive"}" readonly HADOOP_HOME="${HADOOP_HOME:-"/usr/lib/hadoop"}" readonly PRESTO_HOME="$(/usr/share/google/get_metadata_value attributes/alluxio_presto_home || echo "/usr/lib/presto")" -readonly ALLUXIO_VERSION="313-SNAPSHOT" +readonly ALLUXIO_VERSION="313" readonly ALLUXIO_DOWNLOAD_URL="https://downloads.alluxio.io/downloads/files/${ALLUXIO_VERSION}/alluxio-${ALLUXIO_VERSION}-bin.tar.gz" readonly ALLUXIO_HOME="/opt/alluxio" readonly ALLUXIO_SITE_PROPERTIES="${ALLUXIO_HOME}/conf/alluxio-site.properties" diff --git a/integration/docker/Dockerfile b/integration/docker/Dockerfile index 22f68c01145a..da515594023f 100644 --- a/integration/docker/Dockerfile +++ b/integration/docker/Dockerfile @@ -18,7 +18,7 @@ # See - https://github.com/moby/moby/issues/35525 FROM alpine:3.10.2 AS alluxio-extractor # Note that downloads for *-SNAPSHOT tarballs are not available. -ARG ALLUXIO_TARBALL=http://downloads.alluxio.io/downloads/files/313-SNAPSHOT/alluxio-313-SNAPSHOT-bin.tar.gz +ARG ALLUXIO_TARBALL=http://downloads.alluxio.io/downloads/files/313/alluxio-313-bin.tar.gz ADD ${ALLUXIO_TARBALL} /opt/ # Remote tarball needs to be untarred. Local tarball is untarred automatically. diff --git a/integration/docker/Dockerfile-dev b/integration/docker/Dockerfile-dev index 2fd474370a06..32db586194ce 100644 --- a/integration/docker/Dockerfile-dev +++ b/integration/docker/Dockerfile-dev @@ -9,7 +9,7 @@ # See the NOTICE file distributed with this work for information regarding copyright ownership. # -FROM alluxio/alluxio:313-SNAPSHOT +FROM alluxio/alluxio:313 USER root diff --git a/integration/emr/alluxio-emr.sh b/integration/emr/alluxio-emr.sh index 31a6f60d42f0..f1e51f76ccf9 100644 --- a/integration/emr/alluxio-emr.sh +++ b/integration/emr/alluxio-emr.sh @@ -19,7 +19,7 @@ readonly ALLUXIO_HOME="/opt/alluxio" readonly ALLUXIO_SITE_PROPERTIES="${ALLUXIO_HOME}/conf/alluxio-site.properties" readonly AWS_SHUTDOWN_ACTIONS_DIR="/mnt/var/lib/instance-controller/public/shutdown-actions" readonly HADOOP_CONF="/etc/hadoop/conf" -readonly ALLUXIO_VERSION="313-SNAPSHOT" +readonly ALLUXIO_VERSION="313" readonly ALLUXIO_DOWNLOAD_URL="https://downloads.alluxio.io/downloads/files/${ALLUXIO_VERSION}/alluxio-${ALLUXIO_VERSION}-bin.tar.gz" #################### diff --git a/native/pom.xml b/native/pom.xml index 82ecaf76e3a0..281c48737917 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-parent - 313-SNAPSHOT + 313 alluxio-native pom diff --git a/native/rust/archetype/pom.xml b/native/rust/archetype/pom.xml index 8fb182044fdf..7eff15661ad9 100644 --- a/native/rust/archetype/pom.xml +++ b/native/rust/archetype/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-native-rust - 313-SNAPSHOT + 313 alluxio-native-rust-archetype diff --git a/native/rust/pom.xml b/native/rust/pom.xml index 5146f9be3436..4170b7d79ece 100644 --- a/native/rust/pom.xml +++ b/native/rust/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-native - 313-SNAPSHOT + 313 alluxio-native-rust pom diff --git a/native/rust/rspdk/pom.xml b/native/rust/rspdk/pom.xml index 3afa0042a1d2..c830e3100dbc 100644 --- a/native/rust/rspdk/pom.xml +++ b/native/rust/rspdk/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-native-rust - 313-SNAPSHOT + 313 rspdk diff --git a/pom.xml b/pom.xml index f369b0f884c1..0a0da46b56c9 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.alluxio alluxio-parent - 313-SNAPSHOT + 313 pom Alluxio Parent Parent POM of Alluxio project: a Memory-Speed Virtual Distributed Storage System @@ -36,7 +36,7 @@ scm:git:git@github.com:alluxio/alluxio.git scm:git:git@github.com:alluxio/alluxio.git - alluxio-parent-313-SNAPSHOT + alluxio-parent-313 scm:git:git@github.com:alluxio/alluxio.git diff --git a/webui/pom.xml b/webui/pom.xml index 6a082b3d3b77..280719a7cf36 100644 --- a/webui/pom.xml +++ b/webui/pom.xml @@ -16,10 +16,10 @@ org.alluxio alluxio-parent - 313-SNAPSHOT + 313 alluxio-webui - 313-SNAPSHOT + 313 pom Alluxio UI Alluxio web UI pom From efed93c95e6f1cf3b2131066208f03cfd7821b58 Mon Sep 17 00:00:00 2001 From: Alluxio Bot Date: Fri, 7 Jun 2024 12:41:03 -0700 Subject: [PATCH 3/5] Update version to 314-SNAPSHOT --- assembly/client/pom.xml | 2 +- assembly/pom.xml | 2 +- assembly/server/pom.xml | 2 +- common/pom.xml | 2 +- common/transport/pom.xml | 2 +- docs/_config.yml | 4 ++-- dora/core/client/fs/pom.xml | 2 +- dora/core/client/hdfs/pom.xml | 2 +- dora/core/client/hdfs3/pom.xml | 2 +- dora/core/client/pom.xml | 2 +- dora/core/common/pom.xml | 2 +- dora/core/pom.xml | 2 +- dora/core/server/common/pom.xml | 2 +- dora/core/server/master/pom.xml | 2 +- dora/core/server/pom.xml | 2 +- dora/core/server/proxy/pom.xml | 2 +- dora/core/server/worker/pom.xml | 2 +- dora/examples/pom.xml | 2 +- dora/integration/fuse/pom.xml | 2 +- dora/integration/jnifuse/fs/pom.xml | 2 +- dora/integration/jnifuse/native/pom.xml | 2 +- dora/integration/jnifuse/pom.xml | 2 +- dora/integration/pom.xml | 2 +- dora/integration/tools/hms/pom.xml | 2 +- dora/integration/tools/pom.xml | 2 +- dora/integration/tools/validation/pom.xml | 2 +- dora/job/client/pom.xml | 2 +- dora/job/common/pom.xml | 2 +- dora/job/pom.xml | 2 +- dora/job/server/pom.xml | 2 +- dora/microbench/pom.xml | 2 +- dora/minicluster/pom.xml | 2 +- dora/pom.xml | 2 +- dora/shaded/client-hadoop3/pom.xml | 2 +- dora/shaded/client/pom.xml | 2 +- dora/shaded/hadoop/pom.xml | 2 +- dora/shaded/pom.xml | 2 +- dora/shell/pom.xml | 2 +- dora/stress/common/pom.xml | 2 +- dora/stress/pom.xml | 2 +- dora/stress/shell/pom.xml | 4 ++-- dora/tests/integration/pom.xml | 2 +- dora/tests/pom.xml | 2 +- dora/tests/testcontainers/pom.xml | 2 +- dora/underfs/abfs/pom.xml | 2 +- dora/underfs/adl/pom.xml | 2 +- dora/underfs/cephfs-hadoop/pom.xml | 2 +- dora/underfs/cephfs/pom.xml | 2 +- dora/underfs/cos/pom.xml | 2 +- dora/underfs/cosn/pom.xml | 2 +- dora/underfs/gcs/pom.xml | 2 +- dora/underfs/hdfs/pom.xml | 2 +- dora/underfs/local/pom.xml | 2 +- dora/underfs/obs/pom.xml | 2 +- dora/underfs/oss/pom.xml | 2 +- dora/underfs/ozone/pom.xml | 2 +- dora/underfs/pom.xml | 2 +- dora/underfs/s3a/pom.xml | 2 +- dora/underfs/wasb/pom.xml | 2 +- integration/dataproc/alluxio-dataproc.sh | 2 +- integration/docker/Dockerfile | 2 +- integration/docker/Dockerfile-dev | 2 +- integration/emr/alluxio-emr.sh | 2 +- native/pom.xml | 2 +- native/rust/archetype/pom.xml | 2 +- native/rust/pom.xml | 2 +- native/rust/rspdk/pom.xml | 2 +- pom.xml | 4 ++-- webui/pom.xml | 4 ++-- 69 files changed, 73 insertions(+), 73 deletions(-) diff --git a/assembly/client/pom.xml b/assembly/client/pom.xml index a46817e67d31..5480e853f700 100644 --- a/assembly/client/pom.xml +++ b/assembly/client/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-assembly - 313 + 314-SNAPSHOT alluxio-assembly-client jar diff --git a/assembly/pom.xml b/assembly/pom.xml index 3fa43f37ba31..6ca3c7dbc540 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-parent - 313 + 314-SNAPSHOT alluxio-assembly pom diff --git a/assembly/server/pom.xml b/assembly/server/pom.xml index ebc80c33a76d..63be667f0354 100644 --- a/assembly/server/pom.xml +++ b/assembly/server/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-assembly - 313 + 314-SNAPSHOT alluxio-assembly-server jar diff --git a/common/pom.xml b/common/pom.xml index 2308cad1d456..7662cfdbd3b6 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-parent - 313 + 314-SNAPSHOT alluxio-common pom diff --git a/common/transport/pom.xml b/common/transport/pom.xml index a8699eb1fafe..f92f91762f5d 100644 --- a/common/transport/pom.xml +++ b/common/transport/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-common - 313 + 314-SNAPSHOT alluxio-core-transport jar diff --git a/docs/_config.yml b/docs/_config.yml index 3ce4472e2c80..a3d926e24a80 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -7,10 +7,10 @@ kramdown: # The full version string # Used to match the version string portion of file paths, URLs, and dependency versions # e.g. client jar path, -ALLUXIO_VERSION_STRING: 313 +ALLUXIO_VERSION_STRING: 314-SNAPSHOT # We must inline the version string (e.g., "1.4.0-SNAPSHOT") rather than using the macro of Alluxio version. # Otherwise the macro name remains in the output. -ALLUXIO_CLIENT_JAR_PATH: //client/alluxio-313-client.jar +ALLUXIO_CLIENT_JAR_PATH: //client/alluxio-314-SNAPSHOT-client.jar # For release branches, this should be the Alluxio version in the form of ., e.g. both 1.5.0 and 1.5.0-RC1 should use "1.5" # For master branch, this should be "edge" # This should be used to reference versioned pages that are not relative to the docs/ directory diff --git a/dora/core/client/fs/pom.xml b/dora/core/client/fs/pom.xml index 471e08b48330..30da9babc662 100644 --- a/dora/core/client/fs/pom.xml +++ b/dora/core/client/fs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core-client - 313 + 314-SNAPSHOT alluxio-core-client-fs jar diff --git a/dora/core/client/hdfs/pom.xml b/dora/core/client/hdfs/pom.xml index d5c33d71acfd..1a230374ade3 100644 --- a/dora/core/client/hdfs/pom.xml +++ b/dora/core/client/hdfs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core-client - 313 + 314-SNAPSHOT alluxio-core-client-hdfs jar diff --git a/dora/core/client/hdfs3/pom.xml b/dora/core/client/hdfs3/pom.xml index ed3f2e92a62f..7ba711c96050 100644 --- a/dora/core/client/hdfs3/pom.xml +++ b/dora/core/client/hdfs3/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core-client - 313 + 314-SNAPSHOT alluxio-core-client-hdfs3 jar diff --git a/dora/core/client/pom.xml b/dora/core/client/pom.xml index d53e4558ecc6..92b71d54af7d 100644 --- a/dora/core/client/pom.xml +++ b/dora/core/client/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core - 313 + 314-SNAPSHOT alluxio-core-client pom diff --git a/dora/core/common/pom.xml b/dora/core/common/pom.xml index 5cd253464951..2e8bb0cd6f22 100644 --- a/dora/core/common/pom.xml +++ b/dora/core/common/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core - 313 + 314-SNAPSHOT alluxio-core-common jar diff --git a/dora/core/pom.xml b/dora/core/pom.xml index fe5d828ffadb..9d4fb301aa66 100644 --- a/dora/core/pom.xml +++ b/dora/core/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313 + 314-SNAPSHOT alluxio-core pom diff --git a/dora/core/server/common/pom.xml b/dora/core/server/common/pom.xml index 217fa368478f..e315d5e91567 100644 --- a/dora/core/server/common/pom.xml +++ b/dora/core/server/common/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core-server - 313 + 314-SNAPSHOT alluxio-core-server-common jar diff --git a/dora/core/server/master/pom.xml b/dora/core/server/master/pom.xml index f9db4b757bd3..99171e545157 100644 --- a/dora/core/server/master/pom.xml +++ b/dora/core/server/master/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core-server - 313 + 314-SNAPSHOT alluxio-core-server-master jar diff --git a/dora/core/server/pom.xml b/dora/core/server/pom.xml index e24e63a6ba68..d1c651b6ef3c 100644 --- a/dora/core/server/pom.xml +++ b/dora/core/server/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core - 313 + 314-SNAPSHOT alluxio-core-server pom diff --git a/dora/core/server/proxy/pom.xml b/dora/core/server/proxy/pom.xml index 6805e31b64b0..cb10181c24d3 100644 --- a/dora/core/server/proxy/pom.xml +++ b/dora/core/server/proxy/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core-server - 313 + 314-SNAPSHOT alluxio-core-server-proxy jar diff --git a/dora/core/server/worker/pom.xml b/dora/core/server/worker/pom.xml index 938aef7d6aab..1944757aa45b 100644 --- a/dora/core/server/worker/pom.xml +++ b/dora/core/server/worker/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-core-server - 313 + 314-SNAPSHOT alluxio-core-server-worker jar diff --git a/dora/examples/pom.xml b/dora/examples/pom.xml index ad0ee191a7a5..545c84492676 100644 --- a/dora/examples/pom.xml +++ b/dora/examples/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313 + 314-SNAPSHOT alluxio-examples jar diff --git a/dora/integration/fuse/pom.xml b/dora/integration/fuse/pom.xml index 9155521a35e4..b90f7325a335 100644 --- a/dora/integration/fuse/pom.xml +++ b/dora/integration/fuse/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-integration - 313 + 314-SNAPSHOT alluxio-integration-fuse Alluxio Integration - FUSE diff --git a/dora/integration/jnifuse/fs/pom.xml b/dora/integration/jnifuse/fs/pom.xml index 190f1bed4a2f..ff51ef92ab07 100644 --- a/dora/integration/jnifuse/fs/pom.xml +++ b/dora/integration/jnifuse/fs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-integration-jnifuse - 313 + 314-SNAPSHOT alluxio-integration-jnifuse-fs diff --git a/dora/integration/jnifuse/native/pom.xml b/dora/integration/jnifuse/native/pom.xml index dc59eda9b970..b8cbd8c05752 100644 --- a/dora/integration/jnifuse/native/pom.xml +++ b/dora/integration/jnifuse/native/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-integration-jnifuse - 313 + 314-SNAPSHOT alluxio-integration-jnifuse-native diff --git a/dora/integration/jnifuse/pom.xml b/dora/integration/jnifuse/pom.xml index a5bdf6c1e874..71951794fc4d 100644 --- a/dora/integration/jnifuse/pom.xml +++ b/dora/integration/jnifuse/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-integration - 313 + 314-SNAPSHOT alluxio-integration-jnifuse pom diff --git a/dora/integration/pom.xml b/dora/integration/pom.xml index 0845cae96ac4..283761dc9b38 100644 --- a/dora/integration/pom.xml +++ b/dora/integration/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313 + 314-SNAPSHOT alluxio-integration pom diff --git a/dora/integration/tools/hms/pom.xml b/dora/integration/tools/hms/pom.xml index b5dbf10d947e..cd732fd79c13 100644 --- a/dora/integration/tools/hms/pom.xml +++ b/dora/integration/tools/hms/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-integration-tools - 313 + 314-SNAPSHOT alluxio-integration-tools-hms diff --git a/dora/integration/tools/pom.xml b/dora/integration/tools/pom.xml index 46ffce2ee2a1..99c674c3d4d7 100644 --- a/dora/integration/tools/pom.xml +++ b/dora/integration/tools/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-integration - 313 + 314-SNAPSHOT alluxio-integration-tools pom diff --git a/dora/integration/tools/validation/pom.xml b/dora/integration/tools/validation/pom.xml index 00164d76f3d5..0189275b033e 100644 --- a/dora/integration/tools/validation/pom.xml +++ b/dora/integration/tools/validation/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-integration-tools - 313 + 314-SNAPSHOT alluxio-integration-tools-validation jar diff --git a/dora/job/client/pom.xml b/dora/job/client/pom.xml index d73e52b2fd25..a71db8910b26 100644 --- a/dora/job/client/pom.xml +++ b/dora/job/client/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-job - 313 + 314-SNAPSHOT alluxio-job-client jar diff --git a/dora/job/common/pom.xml b/dora/job/common/pom.xml index c6dc661cd8a5..69bea31eb273 100644 --- a/dora/job/common/pom.xml +++ b/dora/job/common/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-job - 313 + 314-SNAPSHOT alluxio-job-common jar diff --git a/dora/job/pom.xml b/dora/job/pom.xml index cca74a3fa6bd..52db6be448f9 100644 --- a/dora/job/pom.xml +++ b/dora/job/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313 + 314-SNAPSHOT alluxio-job pom diff --git a/dora/job/server/pom.xml b/dora/job/server/pom.xml index 42adc1b99a49..d9cb1f38749f 100644 --- a/dora/job/server/pom.xml +++ b/dora/job/server/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-job - 313 + 314-SNAPSHOT alluxio-job-server jar diff --git a/dora/microbench/pom.xml b/dora/microbench/pom.xml index 9fc364124c67..fd2bf2414b13 100644 --- a/dora/microbench/pom.xml +++ b/dora/microbench/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313 + 314-SNAPSHOT alluxio-microbench jar diff --git a/dora/minicluster/pom.xml b/dora/minicluster/pom.xml index 1924b0422b96..3f3cb39123cf 100644 --- a/dora/minicluster/pom.xml +++ b/dora/minicluster/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313 + 314-SNAPSHOT alluxio-minicluster diff --git a/dora/pom.xml b/dora/pom.xml index 497d5402e008..08a9ce6a590d 100644 --- a/dora/pom.xml +++ b/dora/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-parent - 313 + 314-SNAPSHOT alluxio-dora pom diff --git a/dora/shaded/client-hadoop3/pom.xml b/dora/shaded/client-hadoop3/pom.xml index 4660d163df5f..7b0bd9aaefbc 100644 --- a/dora/shaded/client-hadoop3/pom.xml +++ b/dora/shaded/client-hadoop3/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-shaded - 313 + 314-SNAPSHOT alluxio-shaded-hadoop3-client jar diff --git a/dora/shaded/client/pom.xml b/dora/shaded/client/pom.xml index aad441b0da69..933d61ad0f91 100644 --- a/dora/shaded/client/pom.xml +++ b/dora/shaded/client/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-shaded - 313 + 314-SNAPSHOT alluxio-shaded-client jar diff --git a/dora/shaded/hadoop/pom.xml b/dora/shaded/hadoop/pom.xml index c4cbbe709254..622eb72d98df 100644 --- a/dora/shaded/hadoop/pom.xml +++ b/dora/shaded/hadoop/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-shaded - 313 + 314-SNAPSHOT alluxio-shaded-hadoop ${ufs.hadoop.version} diff --git a/dora/shaded/pom.xml b/dora/shaded/pom.xml index b489bbd84c7b..4df732e7e327 100644 --- a/dora/shaded/pom.xml +++ b/dora/shaded/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313 + 314-SNAPSHOT alluxio-shaded pom diff --git a/dora/shell/pom.xml b/dora/shell/pom.xml index 25abf480de64..ee804c7046ac 100644 --- a/dora/shell/pom.xml +++ b/dora/shell/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313 + 314-SNAPSHOT alluxio-shell jar diff --git a/dora/stress/common/pom.xml b/dora/stress/common/pom.xml index afc49ff0c3a6..145211fc2f60 100644 --- a/dora/stress/common/pom.xml +++ b/dora/stress/common/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-stress - 313 + 314-SNAPSHOT alluxio-stress-common jar diff --git a/dora/stress/pom.xml b/dora/stress/pom.xml index 328720aac0d7..2c0b66865a28 100644 --- a/dora/stress/pom.xml +++ b/dora/stress/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313 + 314-SNAPSHOT alluxio-stress pom diff --git a/dora/stress/shell/pom.xml b/dora/stress/shell/pom.xml index 411fb1a11ebe..efaa100de691 100644 --- a/dora/stress/shell/pom.xml +++ b/dora/stress/shell/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-stress - 313 + 314-SNAPSHOT alluxio-stress-shell jar @@ -57,7 +57,7 @@ org.alluxio alluxio-shell - 313 + 314-SNAPSHOT org.alluxio diff --git a/dora/tests/integration/pom.xml b/dora/tests/integration/pom.xml index c822f36d78c3..0bb9f96e456f 100644 --- a/dora/tests/integration/pom.xml +++ b/dora/tests/integration/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-tests - 313 + 314-SNAPSHOT alluxio-tests-integration jar diff --git a/dora/tests/pom.xml b/dora/tests/pom.xml index c4f6ca1cbbd2..0076e094857c 100644 --- a/dora/tests/pom.xml +++ b/dora/tests/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313 + 314-SNAPSHOT alluxio-tests pom diff --git a/dora/tests/testcontainers/pom.xml b/dora/tests/testcontainers/pom.xml index b59b6383b1ad..fe0bbbd15923 100644 --- a/dora/tests/testcontainers/pom.xml +++ b/dora/tests/testcontainers/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-tests - 313 + 314-SNAPSHOT alluxio-tests-testcontainers jar diff --git a/dora/underfs/abfs/pom.xml b/dora/underfs/abfs/pom.xml index 764f093acd32..7c48cf742646 100644 --- a/dora/underfs/abfs/pom.xml +++ b/dora/underfs/abfs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313 + 314-SNAPSHOT alluxio-underfs-abfs Alluxio Under File System - Microsoft Azure DataLake Gen 2 diff --git a/dora/underfs/adl/pom.xml b/dora/underfs/adl/pom.xml index 1747bebaa8a4..073597b36a7d 100755 --- a/dora/underfs/adl/pom.xml +++ b/dora/underfs/adl/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313 + 314-SNAPSHOT alluxio-underfs-adl Alluxio Under File System - Microsoft Azure DataLake diff --git a/dora/underfs/cephfs-hadoop/pom.xml b/dora/underfs/cephfs-hadoop/pom.xml index 0f43ec64dd22..b1a6d0a97943 100644 --- a/dora/underfs/cephfs-hadoop/pom.xml +++ b/dora/underfs/cephfs-hadoop/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313 + 314-SNAPSHOT alluxio-underfs-cephfs-hadoop diff --git a/dora/underfs/cephfs/pom.xml b/dora/underfs/cephfs/pom.xml index 3f065758882b..520431b44ed6 100644 --- a/dora/underfs/cephfs/pom.xml +++ b/dora/underfs/cephfs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313 + 314-SNAPSHOT alluxio-underfs-cephfs Alluxio Under File System - CephFS diff --git a/dora/underfs/cos/pom.xml b/dora/underfs/cos/pom.xml index 4df9a47348eb..531c40eb3800 100644 --- a/dora/underfs/cos/pom.xml +++ b/dora/underfs/cos/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313 + 314-SNAPSHOT alluxio-underfs-cos Alluxio Under File System - Tencent Cloud COS diff --git a/dora/underfs/cosn/pom.xml b/dora/underfs/cosn/pom.xml index 4b71b58052b5..f007f0d45386 100644 --- a/dora/underfs/cosn/pom.xml +++ b/dora/underfs/cosn/pom.xml @@ -17,7 +17,7 @@ org.alluxio alluxio-underfs - 313 + 314-SNAPSHOT alluxio-underfs-cosn diff --git a/dora/underfs/gcs/pom.xml b/dora/underfs/gcs/pom.xml index a03cabe11e34..688916e34903 100644 --- a/dora/underfs/gcs/pom.xml +++ b/dora/underfs/gcs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313 + 314-SNAPSHOT alluxio-underfs-gcs Alluxio Under File System - GCS diff --git a/dora/underfs/hdfs/pom.xml b/dora/underfs/hdfs/pom.xml index 0adc0f3e2a6e..4d18f716264c 100644 --- a/dora/underfs/hdfs/pom.xml +++ b/dora/underfs/hdfs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313 + 314-SNAPSHOT alluxio-underfs-hdfs Alluxio Under File System - HDFS diff --git a/dora/underfs/local/pom.xml b/dora/underfs/local/pom.xml index 6bb11d2cc761..6901c359aef1 100644 --- a/dora/underfs/local/pom.xml +++ b/dora/underfs/local/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313 + 314-SNAPSHOT alluxio-underfs-local Alluxio Under File System - Local FS diff --git a/dora/underfs/obs/pom.xml b/dora/underfs/obs/pom.xml index 4f489cf8315b..d67b09a92704 100644 --- a/dora/underfs/obs/pom.xml +++ b/dora/underfs/obs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313 + 314-SNAPSHOT alluxio-underfs-obs Alluxio Under File System - Huawei OBS diff --git a/dora/underfs/oss/pom.xml b/dora/underfs/oss/pom.xml index 4e67f2f79c6c..9be894b692bd 100644 --- a/dora/underfs/oss/pom.xml +++ b/dora/underfs/oss/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313 + 314-SNAPSHOT alluxio-underfs-oss Alluxio Under File System - Aliyun OSS diff --git a/dora/underfs/ozone/pom.xml b/dora/underfs/ozone/pom.xml index 6aad89621907..00634f3d5473 100644 --- a/dora/underfs/ozone/pom.xml +++ b/dora/underfs/ozone/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313 + 314-SNAPSHOT alluxio-underfs-ozone diff --git a/dora/underfs/pom.xml b/dora/underfs/pom.xml index 48b137557f1d..0bf27af04304 100755 --- a/dora/underfs/pom.xml +++ b/dora/underfs/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-dora - 313 + 314-SNAPSHOT alluxio-underfs pom diff --git a/dora/underfs/s3a/pom.xml b/dora/underfs/s3a/pom.xml index 00b60975b2ea..8a898fe5a8cc 100644 --- a/dora/underfs/s3a/pom.xml +++ b/dora/underfs/s3a/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313 + 314-SNAPSHOT alluxio-underfs-s3a Alluxio Under File System - S3 diff --git a/dora/underfs/wasb/pom.xml b/dora/underfs/wasb/pom.xml index 166233082ab5..6d0e39ebccff 100644 --- a/dora/underfs/wasb/pom.xml +++ b/dora/underfs/wasb/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-underfs - 313 + 314-SNAPSHOT alluxio-underfs-wasb Alluxio Under File System - Microsoft Azure Blob Storage diff --git a/integration/dataproc/alluxio-dataproc.sh b/integration/dataproc/alluxio-dataproc.sh index 94510ae6a923..c533b3667350 100755 --- a/integration/dataproc/alluxio-dataproc.sh +++ b/integration/dataproc/alluxio-dataproc.sh @@ -23,7 +23,7 @@ readonly SPARK_HOME="${SPARK_HOME:-"/usr/lib/spark"}" readonly HIVE_HOME="${HIVE_HOME:-"/usr/lib/hive"}" readonly HADOOP_HOME="${HADOOP_HOME:-"/usr/lib/hadoop"}" readonly PRESTO_HOME="$(/usr/share/google/get_metadata_value attributes/alluxio_presto_home || echo "/usr/lib/presto")" -readonly ALLUXIO_VERSION="313" +readonly ALLUXIO_VERSION="314-SNAPSHOT" readonly ALLUXIO_DOWNLOAD_URL="https://downloads.alluxio.io/downloads/files/${ALLUXIO_VERSION}/alluxio-${ALLUXIO_VERSION}-bin.tar.gz" readonly ALLUXIO_HOME="/opt/alluxio" readonly ALLUXIO_SITE_PROPERTIES="${ALLUXIO_HOME}/conf/alluxio-site.properties" diff --git a/integration/docker/Dockerfile b/integration/docker/Dockerfile index da515594023f..367185960da5 100644 --- a/integration/docker/Dockerfile +++ b/integration/docker/Dockerfile @@ -18,7 +18,7 @@ # See - https://github.com/moby/moby/issues/35525 FROM alpine:3.10.2 AS alluxio-extractor # Note that downloads for *-SNAPSHOT tarballs are not available. -ARG ALLUXIO_TARBALL=http://downloads.alluxio.io/downloads/files/313/alluxio-313-bin.tar.gz +ARG ALLUXIO_TARBALL=http://downloads.alluxio.io/downloads/files/314-SNAPSHOT/alluxio-314-SNAPSHOT-bin.tar.gz ADD ${ALLUXIO_TARBALL} /opt/ # Remote tarball needs to be untarred. Local tarball is untarred automatically. diff --git a/integration/docker/Dockerfile-dev b/integration/docker/Dockerfile-dev index 32db586194ce..38059cac7c78 100644 --- a/integration/docker/Dockerfile-dev +++ b/integration/docker/Dockerfile-dev @@ -9,7 +9,7 @@ # See the NOTICE file distributed with this work for information regarding copyright ownership. # -FROM alluxio/alluxio:313 +FROM alluxio/alluxio:314-SNAPSHOT USER root diff --git a/integration/emr/alluxio-emr.sh b/integration/emr/alluxio-emr.sh index f1e51f76ccf9..86de7c650d2b 100644 --- a/integration/emr/alluxio-emr.sh +++ b/integration/emr/alluxio-emr.sh @@ -19,7 +19,7 @@ readonly ALLUXIO_HOME="/opt/alluxio" readonly ALLUXIO_SITE_PROPERTIES="${ALLUXIO_HOME}/conf/alluxio-site.properties" readonly AWS_SHUTDOWN_ACTIONS_DIR="/mnt/var/lib/instance-controller/public/shutdown-actions" readonly HADOOP_CONF="/etc/hadoop/conf" -readonly ALLUXIO_VERSION="313" +readonly ALLUXIO_VERSION="314-SNAPSHOT" readonly ALLUXIO_DOWNLOAD_URL="https://downloads.alluxio.io/downloads/files/${ALLUXIO_VERSION}/alluxio-${ALLUXIO_VERSION}-bin.tar.gz" #################### diff --git a/native/pom.xml b/native/pom.xml index 281c48737917..28beed8c5640 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-parent - 313 + 314-SNAPSHOT alluxio-native pom diff --git a/native/rust/archetype/pom.xml b/native/rust/archetype/pom.xml index 7eff15661ad9..ad19d231f86d 100644 --- a/native/rust/archetype/pom.xml +++ b/native/rust/archetype/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-native-rust - 313 + 314-SNAPSHOT alluxio-native-rust-archetype diff --git a/native/rust/pom.xml b/native/rust/pom.xml index 4170b7d79ece..b7ceb2e3ba08 100644 --- a/native/rust/pom.xml +++ b/native/rust/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-native - 313 + 314-SNAPSHOT alluxio-native-rust pom diff --git a/native/rust/rspdk/pom.xml b/native/rust/rspdk/pom.xml index c830e3100dbc..75845b3b20ac 100644 --- a/native/rust/rspdk/pom.xml +++ b/native/rust/rspdk/pom.xml @@ -16,7 +16,7 @@ org.alluxio alluxio-native-rust - 313 + 314-SNAPSHOT rspdk diff --git a/pom.xml b/pom.xml index 0a0da46b56c9..64a94bc49d85 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.alluxio alluxio-parent - 313 + 314-SNAPSHOT pom Alluxio Parent Parent POM of Alluxio project: a Memory-Speed Virtual Distributed Storage System @@ -36,7 +36,7 @@ scm:git:git@github.com:alluxio/alluxio.git scm:git:git@github.com:alluxio/alluxio.git - alluxio-parent-313 + alluxio-parent-314-SNAPSHOT scm:git:git@github.com:alluxio/alluxio.git diff --git a/webui/pom.xml b/webui/pom.xml index 280719a7cf36..deb5c4731cc5 100644 --- a/webui/pom.xml +++ b/webui/pom.xml @@ -16,10 +16,10 @@ org.alluxio alluxio-parent - 313 + 314-SNAPSHOT alluxio-webui - 313 + 314-SNAPSHOT pom Alluxio UI Alluxio web UI pom From 05d2537632f0a7fcd16920c384f989a32f5d1742 Mon Sep 17 00:00:00 2001 From: jja725 Date: Mon, 1 Jul 2024 16:29:01 -0700 Subject: [PATCH 4/5] Add back shaded netty within grpc ### What changes are proposed in this pull request? add back netty dependency within grpc ### Why are the changes needed? previously we exclude netty dependency since we already have netty-all outside https://github.com/Alluxio/alluxio/pull/9942 But due to https://github.com/grpc/grpc-java/issues/11284, we sometimes have incompatibility between grpc and netty, and it's better to use shaded netty within grpc so we can be sure that they are compatible. ### Does this PR introduce any user facing changes? na pr-link: Alluxio/alluxio#18642 change-id: cid-65d86f315e023592060b6a9f864bfe2a972dfe68 --- .../test/java/alluxio/membership/MembershipManagerTest.java | 2 +- pom.xml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dora/tests/testcontainers/src/test/java/alluxio/membership/MembershipManagerTest.java b/dora/tests/testcontainers/src/test/java/alluxio/membership/MembershipManagerTest.java index 08b0c972b189..0a393ecff656 100644 --- a/dora/tests/testcontainers/src/test/java/alluxio/membership/MembershipManagerTest.java +++ b/dora/tests/testcontainers/src/test/java/alluxio/membership/MembershipManagerTest.java @@ -82,7 +82,7 @@ public static void init() { @ClassRule public static final GenericContainer ETCD_CONTAINER = - new GenericContainer<>("quay.io/coreos/etcd:latest") + new GenericContainer<>("quay.io/coreos/etcd:v3.5.13") .withCommand("etcd", "--listen-client-urls", "http://0.0.0.0:" + ETCD_PORT, "--advertise-client-urls", "http://0.0.0.0:" + ETCD_PORT) diff --git a/pom.xml b/pom.xml index 64a94bc49d85..94ea68cf93bf 100644 --- a/pom.xml +++ b/pom.xml @@ -416,12 +416,6 @@ io.grpc grpc-netty ${grpc.version} - - - io.netty - * - - io.grpc From 6d996561b222c41253d380ef913c656f8188c4c9 Mon Sep 17 00:00:00 2001 From: LuQQiu Date: Thu, 25 Jul 2024 16:27:18 -0700 Subject: [PATCH 5/5] Install ucx on dockerfile jdk8 Install UCX on dockerfile jdk 8 for github PR test pr-link: Alluxio/alluxio#18663 change-id: cid-44eb2b7eb1c432ca4dd3b8050fa1dd908f0b124e --- dev/github/Dockerfile-jdk11 | 11 +++++++++++ dev/github/Dockerfile-jdk17 | 11 +++++++++++ dev/github/Dockerfile-jdk8 | 11 +++++++++++ 3 files changed, 33 insertions(+) diff --git a/dev/github/Dockerfile-jdk11 b/dev/github/Dockerfile-jdk11 index 677bdbc529c0..1e21e7e96531 100644 --- a/dev/github/Dockerfile-jdk11 +++ b/dev/github/Dockerfile-jdk11 @@ -174,3 +174,14 @@ RUN ARCH=$(dpkg --print-architecture) && \ wget --quiet https://releases.hashicorp.com/terraform/1.0.1/terraform_1.0.1_linux_${ARCH}.zip && \ unzip -o ./terraform_1.0.1_linux_${ARCH}.zip -d /usr/local/bin/ && \ rm terraform_1.0.1_linux_${ARCH}.zip +# UCX for RDMA +RUN wget https://github.com/openucx/ucx/releases/download/v1.16.0/ucx-1.16.0.tar.gz && \ + tar xzf ucx-1.16.0.tar.gz && \ + cd ucx-1.16.0 && \ + mkdir build && \ + cd build && \ + ../configure --prefix=/usr/local --without-go && \ + make -j4 && \ + make install && \ + echo "/usr/local/lib" | tee /etc/ld.so.conf.d/ucx.conf && \ + ldconfig \ diff --git a/dev/github/Dockerfile-jdk17 b/dev/github/Dockerfile-jdk17 index 867529b79d08..f0b95c4cb75d 100644 --- a/dev/github/Dockerfile-jdk17 +++ b/dev/github/Dockerfile-jdk17 @@ -179,3 +179,14 @@ RUN ARCH=$(dpkg --print-architecture) && \ wget --quiet https://releases.hashicorp.com/terraform/1.0.1/terraform_1.0.1_linux_${ARCH}.zip && \ unzip -o ./terraform_1.0.1_linux_${ARCH}.zip -d /usr/local/bin/ && \ rm terraform_1.0.1_linux_${ARCH}.zip +# UCX for RDMA +RUN wget https://github.com/openucx/ucx/releases/download/v1.16.0/ucx-1.16.0.tar.gz && \ + tar xzf ucx-1.16.0.tar.gz && \ + cd ucx-1.16.0 && \ + mkdir build && \ + cd build && \ + ../configure --prefix=/usr/local --without-go && \ + make -j4 && \ + make install && \ + echo "/usr/local/lib" | tee /etc/ld.so.conf.d/ucx.conf && \ + ldconfig \ diff --git a/dev/github/Dockerfile-jdk8 b/dev/github/Dockerfile-jdk8 index 70d9fb4ff4af..9f37e6149f84 100644 --- a/dev/github/Dockerfile-jdk8 +++ b/dev/github/Dockerfile-jdk8 @@ -57,3 +57,14 @@ RUN ARCH=$(dpkg --print-architecture) && \ wget --quiet https://releases.hashicorp.com/terraform/1.0.1/terraform_1.0.1_linux_${ARCH}.zip && \ unzip -o ./terraform_1.0.1_linux_${ARCH}.zip -d /usr/local/bin/ && \ rm terraform_1.0.1_linux_${ARCH}.zip +# UCX for RDMA +RUN wget https://github.com/openucx/ucx/releases/download/v1.16.0/ucx-1.16.0.tar.gz && \ + tar xzf ucx-1.16.0.tar.gz && \ + cd ucx-1.16.0 && \ + mkdir build && \ + cd build && \ + ../configure --prefix=/usr/local --without-go && \ + make -j4 && \ + make install && \ + echo "/usr/local/lib" | tee /etc/ld.so.conf.d/ucx.conf && \ + ldconfig \