-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[#6821] Improves server map performance
- Loading branch information
1 parent
ddbfa72
commit e419421
Showing
42 changed files
with
1,290 additions
and
281 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
88 changes: 88 additions & 0 deletions
88
...ctor/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/mapper/AgentInfoMapper.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,88 @@ | ||
| /* | ||
| * Copyright 2021 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.collector.dao.hbase.mapper; | ||
|
|
||
| import com.navercorp.pinpoint.common.PinpointConstants; | ||
| import com.navercorp.pinpoint.common.buffer.Buffer; | ||
| import com.navercorp.pinpoint.common.buffer.FixedBuffer; | ||
| import com.navercorp.pinpoint.common.hbase.HbaseTableConstants; | ||
| import com.navercorp.pinpoint.common.hbase.RowMapper; | ||
| import com.navercorp.pinpoint.common.server.bo.AgentInfoBo; | ||
| import com.navercorp.pinpoint.common.server.bo.JvmInfoBo; | ||
| import com.navercorp.pinpoint.common.server.bo.ServerMetaDataBo; | ||
| import com.navercorp.pinpoint.common.util.BytesUtils; | ||
| import com.navercorp.pinpoint.common.util.TimeUtils; | ||
| import org.apache.hadoop.hbase.client.Result; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import static com.navercorp.pinpoint.common.hbase.HbaseColumnFamily.AGENTINFO_INFO; | ||
|
|
||
|
|
||
| /** | ||
| * @author HyunGil Jeong | ||
| */ | ||
| @Component | ||
| public class AgentInfoMapper implements RowMapper<AgentInfoBo> { | ||
|
|
||
| @Override | ||
| public AgentInfoBo mapRow(Result result, int rowNum) throws Exception { | ||
| byte[] rowKey = result.getRow(); | ||
| String agentId = BytesUtils.safeTrim(BytesUtils.toString(rowKey, 0, PinpointConstants.AGENT_NAME_MAX_LEN)); | ||
| long reverseStartTime = BytesUtils.bytesToLong(rowKey, HbaseTableConstants.AGENT_NAME_MAX_LEN); | ||
| long startTime = TimeUtils.recoveryTimeMillis(reverseStartTime); | ||
|
|
||
| byte[] serializedAgentInfo = result.getValue(AGENTINFO_INFO.getName(), AGENTINFO_INFO.QUALIFIER_IDENTIFIER); | ||
| byte[] serializedServerMetaData = result.getValue(AGENTINFO_INFO.getName(), AGENTINFO_INFO.QUALIFIER_SERVER_META_DATA); | ||
| byte[] serializedJvmInfo = result.getValue(AGENTINFO_INFO.getName(), AGENTINFO_INFO.QUALIFIER_JVM); | ||
|
|
||
| final AgentInfoBo.Builder agentInfoBoBuilder = createBuilderFromValue(serializedAgentInfo); | ||
| agentInfoBoBuilder.setAgentId(agentId); | ||
| agentInfoBoBuilder.setStartTime(startTime); | ||
|
|
||
| if (serializedServerMetaData != null) { | ||
| agentInfoBoBuilder.setServerMetaData(new ServerMetaDataBo.Builder(serializedServerMetaData).build()); | ||
| } | ||
| if (serializedJvmInfo != null) { | ||
| agentInfoBoBuilder.setJvmInfo(new JvmInfoBo(serializedJvmInfo)); | ||
| } | ||
| return agentInfoBoBuilder.build(); | ||
| } | ||
|
|
||
| private AgentInfoBo.Builder createBuilderFromValue(byte[] serializedAgentInfo) { | ||
| final Buffer buffer = new FixedBuffer(serializedAgentInfo); | ||
| final AgentInfoBo.Builder builder = new AgentInfoBo.Builder(); | ||
| builder.setHostName(buffer.readPrefixedString()); | ||
| builder.setIp(buffer.readPrefixedString()); | ||
| builder.setPorts(buffer.readPrefixedString()); | ||
| builder.setApplicationName(buffer.readPrefixedString()); | ||
| builder.setServiceTypeCode(buffer.readShort()); | ||
| builder.setPid(buffer.readInt()); | ||
| builder.setAgentVersion(buffer.readPrefixedString()); | ||
| builder.setStartTime(buffer.readLong()); | ||
| builder.setEndTimeStamp(buffer.readLong()); | ||
| builder.setEndStatus(buffer.readInt()); | ||
| // FIXME - 2015.09 v1.5.0 added vmVersion (check for compatibility) | ||
| if (buffer.hasRemaining()) { | ||
| builder.setVmVersion(buffer.readPrefixedString()); | ||
| } | ||
| // FIXME - 2018.06 v1.8.0 added container (check for compatibility) | ||
| if (buffer.hasRemaining()) { | ||
| builder.isContainer(buffer.readBoolean()); | ||
| } | ||
| return builder; | ||
| } | ||
| } |
44 changes: 44 additions & 0 deletions
44
...ain/java/com/navercorp/pinpoint/collector/dao/hbase/mapper/AgentInfoResultsExtractor.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,44 @@ | ||
| /* | ||
| * Copyright 2021 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.collector.dao.hbase.mapper; | ||
|
|
||
| import com.navercorp.pinpoint.common.hbase.ResultsExtractor; | ||
| import com.navercorp.pinpoint.common.hbase.RowMapper; | ||
| import com.navercorp.pinpoint.common.server.bo.AgentInfoBo; | ||
| import org.apache.hadoop.hbase.client.Result; | ||
| import org.apache.hadoop.hbase.client.ResultScanner; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| /** | ||
| * @author HyunGil Jeong | ||
| */ | ||
| @Component | ||
| public class AgentInfoResultsExtractor implements ResultsExtractor<AgentInfoBo> { | ||
|
|
||
| @Autowired | ||
| private RowMapper<AgentInfoBo> agentInfoMapper; | ||
|
|
||
| @Override | ||
| public AgentInfoBo extractData(ResultScanner results) throws Exception { | ||
| int found = 0; | ||
| for (Result result : results) { | ||
| return agentInfoMapper.mapRow(result, found++); | ||
| } | ||
| return null; | ||
| } | ||
| } |
Oops, something went wrong.