-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Add compacted topic metrics for TopicStats in CLI #11564
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
codelipenghui
merged 3 commits into
apache:master
from
Technoboy-:add-compacted-topic-metric-1
Aug 21, 2021
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
57 changes: 57 additions & 0 deletions
57
pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactorMXBean.java
This file contains hidden or 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,57 @@ | ||
| /** | ||
| * 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.compaction; | ||
|
|
||
| import org.apache.bookkeeper.common.annotation.InterfaceAudience; | ||
| import org.apache.bookkeeper.common.annotation.InterfaceStability; | ||
|
|
||
| /** | ||
| * JMX Bean interface for Compactor stats. | ||
| */ | ||
| @InterfaceAudience.LimitedPrivate | ||
| @InterfaceStability.Stable | ||
| public interface CompactorMXBean { | ||
|
|
||
| /** | ||
| * @return the removed event count of last compaction | ||
| */ | ||
| long getLastCompactionRemovedEventCount(String topic); | ||
|
|
||
| /** | ||
| * @return the timestamp of last succeed compaction | ||
| */ | ||
| long getLastCompactionSucceedTimestamp(String topic); | ||
|
|
||
| /** | ||
| * @return the timestamp of last failed compaction | ||
| */ | ||
| long getLastCompactionFailedTimestamp(String topic); | ||
|
|
||
| /** | ||
| * @return the duration time of last compaction | ||
| */ | ||
| long getLastCompactionDurationTimeInMills(String topic); | ||
|
|
||
| /** | ||
| * Remove metrics about this topic. | ||
| * @param topic | ||
| */ | ||
| void removeTopic(String topic); | ||
|
|
||
| } |
92 changes: 92 additions & 0 deletions
92
pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactorMXBeanImpl.java
This file contains hidden or 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,92 @@ | ||
| /** | ||
| * 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.compaction; | ||
|
|
||
| import java.util.concurrent.ConcurrentHashMap; | ||
| import java.util.concurrent.atomic.LongAdder; | ||
|
|
||
| public class CompactorMXBeanImpl implements CompactorMXBean { | ||
|
|
||
| private final ConcurrentHashMap<String, CompactRecord> compactRecordOps = new ConcurrentHashMap<>(); | ||
|
|
||
| public void addCompactionRemovedEvent(String topic) { | ||
| compactRecordOps.computeIfAbsent(topic, k -> new CompactRecord()).addCompactionRemovedEvent(); | ||
| } | ||
|
|
||
| public void addCompactionStartOp(String topic) { | ||
| compactRecordOps.computeIfAbsent(topic, k -> new CompactRecord()).reset(); | ||
| } | ||
|
|
||
| public void addCompactionEndOp(String topic, boolean succeed) { | ||
| CompactRecord compactRecord = compactRecordOps.computeIfAbsent(topic, k -> new CompactRecord()); | ||
| compactRecord.lastCompactionDurationTimeInMills = System.currentTimeMillis() | ||
| - compactRecord.lastCompactionStartTimeOp; | ||
| compactRecord.lastCompactionRemovedEventCount = compactRecord.lastCompactionRemovedEventCountOp.longValue(); | ||
| if (succeed) { | ||
| compactRecord.lastCompactionSucceedTimestamp = System.currentTimeMillis(); | ||
| } else { | ||
| compactRecord.lastCompactionFailedTimestamp = System.currentTimeMillis(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public long getLastCompactionRemovedEventCount(String topic) { | ||
| return compactRecordOps.getOrDefault(topic, new CompactRecord()).lastCompactionRemovedEventCount; | ||
| } | ||
|
|
||
| @Override | ||
| public long getLastCompactionSucceedTimestamp(String topic) { | ||
| return compactRecordOps.getOrDefault(topic, new CompactRecord()).lastCompactionSucceedTimestamp; | ||
| } | ||
|
|
||
| @Override | ||
| public long getLastCompactionFailedTimestamp(String topic) { | ||
| return compactRecordOps.getOrDefault(topic, new CompactRecord()).lastCompactionFailedTimestamp; | ||
| } | ||
|
|
||
| @Override | ||
| public long getLastCompactionDurationTimeInMills(String topic) { | ||
| return compactRecordOps.getOrDefault(topic, new CompactRecord()).lastCompactionDurationTimeInMills; | ||
| } | ||
|
|
||
| @Override | ||
| public void removeTopic(String topic) { | ||
| compactRecordOps.remove(topic); | ||
| } | ||
|
|
||
| static class CompactRecord { | ||
|
|
||
| private long lastCompactionRemovedEventCount = 0L; | ||
| private long lastCompactionSucceedTimestamp = 0L; | ||
| private long lastCompactionFailedTimestamp = 0L; | ||
| private long lastCompactionDurationTimeInMills = 0L; | ||
|
|
||
| private LongAdder lastCompactionRemovedEventCountOp = new LongAdder(); | ||
| private long lastCompactionStartTimeOp; | ||
|
|
||
| public void addCompactionRemovedEvent() { | ||
| lastCompactionRemovedEventCountOp.increment(); | ||
| } | ||
|
|
||
| public void reset() { | ||
| lastCompactionRemovedEventCountOp.reset(); | ||
| lastCompactionStartTimeOp = System.currentTimeMillis(); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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
50 changes: 50 additions & 0 deletions
50
pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorMXBeanImplTest.java
This file contains hidden or 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,50 @@ | ||
| /** | ||
| * 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.compaction; | ||
|
|
||
| import org.apache.pulsar.broker.service.BrokerService; | ||
| import org.mockito.Mockito; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import java.util.Optional; | ||
| import java.util.concurrent.ScheduledExecutorService; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| @Test(groups = "broker-compaction") | ||
| public class CompactorMXBeanImplTest { | ||
|
|
||
| @Test | ||
| public void testSimple() throws Exception { | ||
| CompactorMXBeanImpl mxBean = new CompactorMXBeanImpl(); | ||
| String topic = "topic1"; | ||
| mxBean.addCompactionStartOp(topic); | ||
| assertEquals(mxBean.getLastCompactionRemovedEventCount(topic), 0, 0); | ||
| mxBean.addCompactionRemovedEvent(topic); | ||
| assertEquals(mxBean.getLastCompactionRemovedEventCount(topic), 0, 0); | ||
| mxBean.addCompactionEndOp(topic, true); | ||
| mxBean.addCompactionEndOp(topic, false); | ||
| assertEquals(mxBean.getLastCompactionRemovedEventCount(topic), 1, 0); | ||
| assertTrue(mxBean.getLastCompactionSucceedTimestamp(topic) > 0L); | ||
| assertTrue(mxBean.getLastCompactionFailedTimestamp(topic) > 0L); | ||
| assertTrue(mxBean.getLastCompactionDurationTimeInMills(topic) >= 0L); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.