forked from apache/pulsar
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Grpc upgrade; BK upgrade for LS 2.7 (#14)
* [Issue 9728] Upgrade GRPC and bookkeeper (apache#9729) * Upgraded bookkeeper to 4.13.0; grpc to 1.33 Fixes apache#10937 *Motivation* The previours bk version was introduce an incompatible issue with BouncyCastle FIPS. BookKeeper already fix this and we should upgrade the version to resolve the issue. For more information: apache#10937 *Modifications* * Upgrade to BookKeeper 4.14.3 (apache#12760) * Fixed additional post-cherry-pick conflicts Co-authored-by: hangc0276 <chenhang@apache.org> Co-authored-by: chenhang <chenhang@bigo.sg> Co-authored-by: Yong Zhang <zhangyong1025.zy@gmail.com> Co-authored-by: Matteo Merli <mmerli@apache.org>
- Loading branch information
5 people
committed
Dec 1, 2021
1 parent
2a893c9
commit 116f90e
Showing
25 changed files
with
208 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
...ker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/LongAdderCounter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /** | ||
| * 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. | ||
| */ | ||
| package org.apache.pulsar.broker.stats.prometheus.metrics; | ||
|
|
||
| import java.util.concurrent.atomic.LongAdder; | ||
| import org.apache.bookkeeper.stats.Counter; | ||
|
|
||
| /** | ||
| * {@link Counter} implementation based on {@link LongAdder}. | ||
| * | ||
| * <p>LongAdder keeps a counter per-thread and then aggregates to get the result, in order to avoid contention between | ||
| * multiple threads. | ||
| */ | ||
| public class LongAdderCounter implements Counter { | ||
| private final LongAdder counter = new LongAdder(); | ||
|
|
||
| public LongAdderCounter() { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void clear() { | ||
| counter.reset(); | ||
| } | ||
|
|
||
| @Override | ||
| public void inc() { | ||
| counter.increment(); | ||
| } | ||
|
|
||
| @Override | ||
| public void dec() { | ||
| counter.decrement(); | ||
| } | ||
|
|
||
| @Override | ||
| public void add(long delta) { | ||
| counter.add(delta); | ||
| } | ||
|
|
||
| @Override | ||
| public Long get() { | ||
| return counter.sum(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.