This is an automated email from the ASF dual-hosted git repository.
shoothzj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 5b3cd8d580 build: remove empty module backward-compat
yahoo-custom-version (#4331)
5b3cd8d580 is described below
commit 5b3cd8d580dcfb6feceac7fd6105ea023d0d11aa
Author: ZhangJian He <[email protected]>
AuthorDate: Fri May 10 15:47:06 2024 +0800
build: remove empty module backward-compat yahoo-custom-version (#4331)
### Changes
1. Remove empty module backward-compat yahoo-custom-version
2. fix a minor annotation in LedgerHandle
Signed-off-by: ZhangJian He <[email protected]>
---
.github/workflows/bk-ci.yml | 2 +-
.../org/apache/bookkeeper/client/LedgerHandle.java | 2 +-
tests/backward-compat/pom.xml | 1 -
tests/backward-compat/yahoo-custom-version/pom.xml | 32 ----------------------
4 files changed, 2 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/bk-ci.yml b/.github/workflows/bk-ci.yml
index d4007743b6..f14e2e2578 100644
--- a/.github/workflows/bk-ci.yml
+++ b/.github/workflows/bk-ci.yml
@@ -329,7 +329,7 @@ jobs:
- name: Other tests
run: |
- mvn -B -nsu -DbackwardCompatTests -pl
:bc-non-fips,:hierarchical-ledger-manager,:hostname-bookieid,:old-cookie-new-cluster,:recovery-no-password,:upgrade-direct,:yahoo-custom-version
test
+ mvn -B -nsu -DbackwardCompatTests -pl
:bc-non-fips,:hierarchical-ledger-manager,:hostname-bookieid,:old-cookie-new-cluster,:recovery-no-password,:upgrade-direct
test
- name: Upload container logs on failure
uses: actions/upload-artifact@v4
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
index a9698b6c7e..c49aa65616 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
@@ -2331,7 +2331,7 @@ public class LedgerHandle implements WriteHandle {
/**
* Return a {@link WriteSet} suitable for reading a particular entry.
- * This will include all bookies that are cotna
+ * This will include all bookies that are part of the ensemble for the
entry.
*/
WriteSet getWriteSetForReadOperation(long entryId) {
if (stickyBookieIndex != STICKY_READ_BOOKIE_INDEX_UNSET) {
diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml
index 4ab29c9f4b..024656982f 100644
--- a/tests/backward-compat/pom.xml
+++ b/tests/backward-compat/pom.xml
@@ -35,7 +35,6 @@
<module>recovery-no-password</module>
<module>old-cookie-new-cluster</module>
<module>current-server-old-clients</module>
- <module>yahoo-custom-version</module>
<module>bc-non-fips</module>
</modules>
<dependencyManagement>
diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml
b/tests/backward-compat/yahoo-custom-version/pom.xml
deleted file mode 100644
index 4358a87fc4..0000000000
--- a/tests/backward-compat/yahoo-custom-version/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="
http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>backward-compat</artifactId>
- <version>4.18.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
- <artifactId>yahoo-custom-version</artifactId>
- <packaging>jar</packaging>
- <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade
between yahoo custom version and current</name>
-
-</project>
