Skip to content

Commit fbf5c77

Browse files
authored
Merge branch 'master' into chenhang/fix_lost_data_on_multiple_ledgers
2 parents 211a41f + f773292 commit fbf5c77

File tree

228 files changed

+7879
-6233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+7879
-6233
lines changed

.dlc.json

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"ignorePatterns": [
3+
{
4+
"pattern": "^http://localhost"
5+
},
6+
{
7+
"pattern": "^https://kubernetes.io/docs/resources-reference/v1.6/"
8+
},
9+
{
10+
"pattern": "^https://zookeeper.apache.org/doc/"
11+
},
12+
{
13+
"pattern": "^http://zookeeper.apache.org/doc/current/api/"
14+
},
15+
{
16+
"pattern": "^https://github.com/apache/bookkeeper/"
17+
},
18+
{
19+
"pattern": "^https://github.com/sijie/bookkeeper/tree/bookie_shell_refactor"
20+
},
21+
{
22+
"pattern": "^http://pulsar.incubator.apache.org/docs/latest/getting-started/ConceptsAndArchitecture/#persistent-storage"
23+
},
24+
{
25+
"pattern": "^https://zookeeper.apache.org/doc/current/api/org/apache/zookeeper/"
26+
},
27+
{
28+
"pattern": "^http://pulsar.incubator.apache.org/docs/latest/getting-started/ConceptsAndArchitecture/#persistent-storage"
29+
},
30+
{
31+
"pattern": "^https://bookkeeper.apache.org/docs/api/javadoc/"
32+
},
33+
{
34+
"pattern": "^http://hbtc2012.hadooper.cn/subject/track1maheswara2.pdf"
35+
},
36+
{
37+
"pattern": "^https://developer.yahoo.com/blogs/ydn/bookkeeper-durability-scale-54048.html"
38+
},
39+
{
40+
"pattern": "^http://apache.claz.org/bookkeeper"
41+
},
42+
{
43+
"pattern": "^https://dcos.io/"
44+
},
45+
{
46+
"pattern": "^ https://docs.mesosphere.com"
47+
},
48+
{
49+
"pattern": "^http://master.dcos/exhibitor"
50+
},
51+
{
52+
"pattern": "^https://docs.mesosphere.com/"
53+
},
54+
{
55+
"pattern": "^https://distributedlog.io"
56+
},
57+
{
58+
"pattern": "^https://www.opengroup.org/membership/forums/platform/unix"
59+
},
60+
{
61+
"pattern": "^https://docs.oracle.com/javase/8/docs/technotes/guides/security/jgss/tutorials/KerberosReq.html"
62+
},
63+
{
64+
"pattern": "^http://daxue.qq.com/content/content/id/2492"
65+
}
66+
],
67+
"timeout": "10s",
68+
"retryOn429": true,
69+
"retryCount": 10,
70+
"fallbackRetryDelay": "1000s",
71+
"aliveStatusCodes": [
72+
200,
73+
400,
74+
401,
75+
403
76+
]
77+
}

.github/ISSUE_TEMPLATE/bp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ assignees: ''
99

1010
**BP**
1111

12-
> Follow the instructions at http://bookkeeper.apache.org/community/bookkeeper_proposals/ to create a proposal.
12+
> Follow the instructions at https://bookkeeper.apache.org/community/bookkeeper-proposals/ to create a proposal.
1313
1414
This is the master ticket for tracking BP-xyz :
1515

.github/workflows/backward-compat-tests.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ on:
3030
workflow_dispatch:
3131

3232
env:
33-
GRADLE_ARGS: -Dtestlogger.theme=plain -DtestHideStandardOut=true
33+
MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
3434

3535
jobs:
3636
test:
@@ -48,11 +48,12 @@ jobs:
4848
uses: actions/setup-java@v1
4949
with:
5050
java-version: 1.8
51-
- name: Build
52-
run: ./gradlew stream:server:build -x test ${GRADLE_ARGS}
51+
- name: Install Module
52+
run: mvn -B -nsu clean install -DskipTests
5353
- name: Test current server with old clients
54-
run: ./gradlew :tests:backward-compat:current-server-old-clients:test ${GRADLE_ARGS} || (tail -n +1 tests/backward-compat/current-server-old-clients/build/reports/tests/test/classes/* && tail -n +1 tests/backward-compat/current-server-old-clients/build/container-logs/**/* && exit 1)
54+
run: mvn -B -nsu -DintegrationTests -pl :backward-compat-current-server-old-clients test
5555
- name: Test progressive upgrade
56-
run: ./gradlew :tests:backward-compat:upgrade:test ${GRADLE_ARGS} || (tail -n +1 tests/backward-compat/upgrade/build/reports/tests/test/classes/* && tail -n +1 tests/backward-compat/upgrade/build/container-logs/**/* && exit 1)
56+
run: mvn -B -nsu -DintegrationTests -pl :upgrade test
5757
- name: Other tests
58-
run: ./gradlew :tests:backward-compat:test -x tests:backward-compat:upgrade:test -x :tests:backward-compat:current-server-old-clients:test ${GRADLE_ARGS}
58+
run: |
59+
mvn -B -nsu -DintegrationTests -pl :bc-non-fips,:hierarchical-ledger-manager,:hostname-bookieid,:old-cookie-new-cluster,:recovery-no-password,:upgrade-direct,:yahoo-custom-version test

.github/workflows/bookie-tests.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,8 @@ jobs:
5353
- name: Maven build bookkeeper-server
5454
run: mvn -B -nsu -am -pl bookkeeper-server clean install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
5555

56-
- name: Run EntryLogTests
57-
run: mvn -B -nsu -pl bookkeeper-server test -Dtest="org.apache.bookkeeper.bookie.TestEntryLog" -DfailIfNoTests=false -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
58-
59-
- name: Run InterleavedLedgerStorageTest
60-
run: mvn -B -nsu -pl bookkeeper-server test -Dtest="org.apache.bookkeeper.bookie.TestInterleavedLederStorage" -DfailIfNoTests=false -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
61-
6256
- name: Run bookie tests
63-
run: mvn -B -nsu -pl bookkeeper-server test -Dtest="org.apache.bookkeeper.bookie.*Test" -DfailIfNoTests=false -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
57+
run: mvn -B -nsu -pl bookkeeper-server test -Dtest="org.apache.bookkeeper.bookie.**" -DfailIfNoTests=false -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
6458

6559
- name: Run shell tests
6660
run: mvn -B -nsu -pl tests/scripts install -DfailIfNoTests=false -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO

.github/workflows/gradle-build.yml renamed to .github/workflows/compatibility-check-java17.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# under the License.
1818
#
1919

20-
name: Build with gradle on JDK 11
20+
name: Compatibility Check Java17
2121

2222
on:
2323
push:
@@ -27,13 +27,12 @@ on:
2727
- branch-*
2828
paths-ignore:
2929
- 'site3/**'
30-
workflow_dispatch:
3130

3231
env:
33-
GRADLE_ARGS: -Dtestlogger.theme=plain -DtestHideStandardOut=true
32+
MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
3433

3534
jobs:
36-
test:
35+
check:
3736

3837
runs-on: ubuntu-latest
3938
timeout-minutes: 60
@@ -48,7 +47,9 @@ jobs:
4847
uses: actions/setup-java@v2
4948
with:
5049
distribution: 'temurin'
51-
java-version: 11
52-
53-
- name: Build everything with gradle to validate the build works
54-
run: ./gradlew build -x signDistTar -x test
50+
java-version: 17
51+
- name: Build with Maven
52+
run: mvn clean package -B -nsu -DskipBookKeeperServerTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
53+
- name: print JVM thread dumps when cancelled
54+
if: cancelled()
55+
run: ./dev/ci-tool print_thread_dumps
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
name: Dead link checker
18+
19+
on:
20+
push:
21+
pull_request:
22+
branches:
23+
- master
24+
- branch-*
25+
paths:
26+
- '**.md'
27+
28+
concurrency:
29+
group: dlc-${{ github.event.pull_request.number || github.ref }}
30+
cancel-in-progress: true
31+
32+
jobs:
33+
check-dead-links:
34+
runs-on: ubuntu-latest
35+
timeout-minutes: 30
36+
steps:
37+
- uses: actions/checkout@v2
38+
- run: sudo npm install -g markdown-link-check@3.8.7
39+
- run: |
40+
for file in $(find . -name "*.md"); do
41+
markdown-link-check -c .dlc.json -q "$file"
42+
done

.github/workflows/pr-validation.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ on:
3131

3232
env:
3333
MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
34-
GRADLE_ARGS: -Dtestlogger.theme=plain -DtestHideStandardOut=true
3534

3635
jobs:
3736
check:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
.settings/
55
.recommenders/
66

7-
# Intellij
7+
# IntelliJ
88
.idea/
99
*.iml
1010
*.iws

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ We feel that a welcoming open community is important and welcome contributions.
4848

4949
2. Take a look at our open issues: [Github Issues](https://github.com/apache/bookkeeper/issues).
5050

51-
3. Review our [coding style](https://bookkeeper.apache.org/community/coding_guide/) and follow our [pull requests](https://github.com/apache/bookkeeper/pulls) to learn more about our conventions.
51+
3. Review our [coding style](https://bookkeeper.apache.org/community/coding-guide/) and follow our [pull requests](https://github.com/apache/bookkeeper/pulls) to learn more about our conventions.
5252

5353
4. Make your changes according to our [contributing guide](https://bookkeeper.apache.org/community/contributing/)

0 commit comments

Comments
 (0)