forked from pinpoint-apm/pinpoint
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[pinpoint-apm#10640] Add node limit in ServerMap to prevent OOM
- Loading branch information
Showing
7 changed files
with
238 additions
and
4 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
101 changes: 101 additions & 0 deletions
101
.../com/navercorp/pinpoint/web/applicationmap/map/processor/ApplicationLimiterProcessor.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,101 @@ | ||
| /* | ||
| * Copyright 2023 NAVER Corp. | ||
| * | ||
| * Licensed 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 com.navercorp.pinpoint.web.applicationmap.map.processor; | ||
|
|
||
| import com.navercorp.pinpoint.common.server.util.time.Range; | ||
| import com.navercorp.pinpoint.web.applicationmap.link.LinkDirection; | ||
| import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkData; | ||
| import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; | ||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
|
|
||
| import javax.annotation.concurrent.GuardedBy; | ||
| import java.util.Collection; | ||
|
|
||
| /** | ||
| * @author HyunGil Jeong | ||
| */ | ||
| public class ApplicationLimiterProcessor implements LinkDataMapProcessor { | ||
|
|
||
| private final Logger logger = LogManager.getLogger(this.getClass()); | ||
|
|
||
| private static final int BYPASS = Integer.MAX_VALUE; | ||
| private static final int EMPTY = 0; | ||
|
|
||
| private final int maxLinkSize; | ||
|
|
||
| @GuardedBy("this") | ||
| private int counter = 0; | ||
|
|
||
|
|
||
| public ApplicationLimiterProcessor(int maxLinkSize) { | ||
| this.maxLinkSize = maxLinkSize; | ||
| } | ||
|
|
||
| boolean limitReached() { | ||
| synchronized (this) { | ||
| return maxLinkSize < counter; | ||
| } | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| public LinkDataMap processLinkDataMap(LinkDirection direction, LinkDataMap linkDataMap, Range range) { | ||
| final int remain = remain(linkDataMap); | ||
| if (remain == BYPASS) { | ||
| return linkDataMap; | ||
| } | ||
| if (remain == EMPTY) { | ||
| return new LinkDataMap(); | ||
| } | ||
| logger.debug("{} Remain {}-->{}, link count {}", direction, linkDataMap, linkDataMap.size(), remain); | ||
| Collection<LinkData> linkDataList = linkDataMap.getLinkDataList(); | ||
|
|
||
| LinkDataMap copy = new LinkDataMap(linkDataMap.getTimeWindow()); | ||
| int i = 0; | ||
| for (LinkData linkData : linkDataList) { | ||
| logger.debug("add link {}", linkData); | ||
| copy.addLinkData(linkData); | ||
| if (++i >= remain) { | ||
| logger.debug("break {}/{}", i, remain); | ||
| break; | ||
| } | ||
| } | ||
| return copy; | ||
| } | ||
|
|
||
| private int remain(LinkDataMap linkDataMap) { | ||
| final int size = linkDataMap.size(); | ||
|
|
||
| synchronized (this) { | ||
| final int counter = this.counter; | ||
| final int current = counter + size; | ||
| this.counter += size; | ||
| if (this.maxLinkSize >= current) { | ||
| return BYPASS; | ||
| } | ||
| final int remain = this.maxLinkSize - counter; | ||
| if (remain > 0) { | ||
| return remain; | ||
| } | ||
| // empty; | ||
| return EMPTY; | ||
| } | ||
| } | ||
|
|
||
| } |
37 changes: 37 additions & 0 deletions
37
...vercorp/pinpoint/web/applicationmap/map/processor/ApplicationLimiterProcessorFactory.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,37 @@ | ||
| /* | ||
| * Copyright 2024 NAVER Corp. | ||
| * | ||
| * Licensed 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 com.navercorp.pinpoint.web.applicationmap.map.processor; | ||
|
|
||
| import java.util.function.Supplier; | ||
|
|
||
| public class ApplicationLimiterProcessorFactory implements Supplier<LinkDataMapProcessor> { | ||
|
|
||
| private final int limit; | ||
|
|
||
| public ApplicationLimiterProcessorFactory(int limit) { | ||
| this.limit = limit; | ||
| } | ||
|
|
||
| @Override | ||
| public LinkDataMapProcessor get() { | ||
| if (limit == -1) { | ||
| return LinkDataMapProcessor.NO_OP; | ||
| } | ||
| return new ApplicationLimiterProcessor(limit); | ||
| } | ||
| } |
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
74 changes: 74 additions & 0 deletions
74
.../navercorp/pinpoint/web/applicationmap/map/processor/ApplicationLimiterProcessorTest.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,74 @@ | ||
| /* | ||
| * Copyright 2023 NAVER Corp. | ||
| * | ||
| * Licensed 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 com.navercorp.pinpoint.web.applicationmap.map.processor; | ||
|
|
||
| import com.navercorp.pinpoint.common.server.util.time.Range; | ||
| import com.navercorp.pinpoint.common.trace.ServiceType; | ||
| import com.navercorp.pinpoint.web.applicationmap.link.LinkDirection; | ||
| import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkData; | ||
| import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; | ||
| import com.navercorp.pinpoint.web.vo.Application; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class ApplicationLimiterProcessorTest { | ||
|
|
||
| Application application1 = new Application("test1", ServiceType.TEST); | ||
| Application application2 = new Application("test2", ServiceType.TEST); | ||
| Range between = Range.between(10, 100); | ||
|
|
||
| @Test | ||
| void limitReached() { | ||
|
|
||
| ApplicationLimiterProcessor processor = new ApplicationLimiterProcessor(2); | ||
| LinkDataMap linkDataMap = new LinkDataMap(); | ||
| linkDataMap.addLinkData(new LinkData(application1, application1)); | ||
|
|
||
| processor.processLinkDataMap(LinkDirection.IN_LINK, linkDataMap, between); | ||
| Assertions.assertFalse(processor.limitReached()); | ||
|
|
||
| processor.processLinkDataMap(LinkDirection.IN_LINK, linkDataMap, between); | ||
| Assertions.assertFalse(processor.limitReached()); | ||
|
|
||
|
|
||
| processor.processLinkDataMap(LinkDirection.IN_LINK, linkDataMap, between); | ||
| Assertions.assertTrue(processor.limitReached()); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| void limitReached_2() { | ||
|
|
||
| ApplicationLimiterProcessor processor = new ApplicationLimiterProcessor(2); | ||
| LinkDataMap linkDataMap = new LinkDataMap(); | ||
| linkDataMap.addLinkData(new LinkData(application1, application1)); | ||
|
|
||
| processor.processLinkDataMap(LinkDirection.IN_LINK, linkDataMap, between); | ||
| Assertions.assertFalse(processor.limitReached()); | ||
|
|
||
| LinkDataMap linkDataMap2 = new LinkDataMap(); | ||
| linkDataMap2.addLinkData(new LinkData(application1, application1)); | ||
| linkDataMap2.addLinkData(new LinkData(application2, application2)); | ||
| LinkDataMap replaceLink = processor.processLinkDataMap(LinkDirection.IN_LINK, linkDataMap2, between); | ||
| Assertions.assertTrue(processor.limitReached()); | ||
| Assertions.assertEquals(1, replaceLink.size()); | ||
|
|
||
| processor.processLinkDataMap(LinkDirection.IN_LINK, linkDataMap, between); | ||
| Assertions.assertTrue(processor.limitReached()); | ||
| } | ||
| } |