-
Notifications
You must be signed in to change notification settings - Fork 588
HDDS-12097. Enhance Container Key Mapper for Faster Processing. #8002
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
Merged
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
2f26854
Rebased the PR
ArafatKhan2198 2e4aa4e
More changes
ArafatKhan2198 2cbc5fb
Fixed checkstyle issues
ArafatKhan2198 8ac70df
Fixed bug
ArafatKhan2198 eb5c4ff
Added new changes
ArafatKhan2198 2a164b9
Changed log levels to debug
ArafatKhan2198 cb8faae
Fixed checkstyle and bugs
ArafatKhan2198 f346a41
Fixed last review comments
ArafatKhan2198 03bd42f
Fixed java doc issue
ArafatKhan2198 75b2498
Fixed java doc issue
ArafatKhan2198 36d34ef
Made minor changes
ArafatKhan2198 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
510 changes: 235 additions & 275 deletions
510
...e/recon/tasks/ContainerKeyMapperTask.java → ...recon/tasks/ContainerKeyMapperHelper.java
Large diffs are not rendered by default.
Oops, something went wrong.
65 changes: 65 additions & 0 deletions
65
...ne/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperTaskFSO.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,65 @@ | ||
| /* | ||
| * 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.hadoop.ozone.recon.tasks; | ||
|
|
||
| import com.google.inject.Inject; | ||
| import java.util.Map; | ||
| import org.apache.hadoop.hdds.conf.OzoneConfiguration; | ||
| import org.apache.hadoop.ozone.om.OMMetadataManager; | ||
| import org.apache.hadoop.ozone.om.helpers.BucketLayout; | ||
| import org.apache.hadoop.ozone.recon.ReconServerConfigKeys; | ||
| import org.apache.hadoop.ozone.recon.spi.ReconContainerMetadataManager; | ||
|
|
||
| /** | ||
| * Task for processing ContainerKey mapping specifically for FSO buckets. | ||
| */ | ||
| public class ContainerKeyMapperTaskFSO implements ReconOmTask { | ||
|
|
||
| private final ReconContainerMetadataManager reconContainerMetadataManager; | ||
| private final OzoneConfiguration ozoneConfiguration; | ||
|
|
||
| @Inject | ||
| public ContainerKeyMapperTaskFSO(ReconContainerMetadataManager reconContainerMetadataManager, | ||
| OzoneConfiguration configuration) { | ||
| this.reconContainerMetadataManager = reconContainerMetadataManager; | ||
| this.ozoneConfiguration = configuration; | ||
| } | ||
|
|
||
| @Override | ||
| public TaskResult reprocess(OMMetadataManager omMetadataManager) { | ||
| long containerKeyFlushToDBMaxThreshold = ozoneConfiguration.getLong( | ||
| ReconServerConfigKeys.OZONE_RECON_CONTAINER_KEY_FLUSH_TO_DB_MAX_THRESHOLD, | ||
| ReconServerConfigKeys.OZONE_RECON_CONTAINER_KEY_FLUSH_TO_DB_MAX_THRESHOLD_DEFAULT); | ||
| boolean result = ContainerKeyMapperHelper.reprocess( | ||
| omMetadataManager, reconContainerMetadataManager, | ||
| BucketLayout.FILE_SYSTEM_OPTIMIZED, getTaskName(), containerKeyFlushToDBMaxThreshold); | ||
| return buildTaskResult(result); | ||
| } | ||
|
|
||
| @Override | ||
| public String getTaskName() { | ||
| return "ContainerKeyMapperTaskFSO"; | ||
| } | ||
|
|
||
| @Override | ||
| public TaskResult process(OMUpdateEventBatch events, Map<String, Integer> subTaskSeekPosMap) { | ||
| boolean result = | ||
| ContainerKeyMapperHelper.process(events, "fileTable", reconContainerMetadataManager, getTaskName()); | ||
| return buildTaskResult(result); | ||
| } | ||
| } |
64 changes: 64 additions & 0 deletions
64
...ne/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperTaskOBS.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,64 @@ | ||
| /* | ||
| * 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.hadoop.ozone.recon.tasks; | ||
|
|
||
| import com.google.inject.Inject; | ||
| import java.util.Map; | ||
| import org.apache.hadoop.hdds.conf.OzoneConfiguration; | ||
| import org.apache.hadoop.ozone.om.OMMetadataManager; | ||
| import org.apache.hadoop.ozone.om.helpers.BucketLayout; | ||
| import org.apache.hadoop.ozone.recon.ReconServerConfigKeys; | ||
| import org.apache.hadoop.ozone.recon.spi.ReconContainerMetadataManager; | ||
|
|
||
| /** | ||
| * Task for processing ContainerKey mapping specifically for OBS buckets. | ||
| */ | ||
| public class ContainerKeyMapperTaskOBS implements ReconOmTask { | ||
|
|
||
| private final ReconContainerMetadataManager reconContainerMetadataManager; | ||
| private final OzoneConfiguration ozoneConfiguration; | ||
|
|
||
| @Inject | ||
| public ContainerKeyMapperTaskOBS(ReconContainerMetadataManager reconContainerMetadataManager, | ||
| OzoneConfiguration configuration) { | ||
| this.reconContainerMetadataManager = reconContainerMetadataManager; | ||
| this.ozoneConfiguration = configuration; | ||
| } | ||
|
|
||
| @Override | ||
| public TaskResult reprocess(OMMetadataManager omMetadataManager) { | ||
| long containerKeyFlushToDBMaxThreshold = ozoneConfiguration.getLong( | ||
| ReconServerConfigKeys.OZONE_RECON_CONTAINER_KEY_FLUSH_TO_DB_MAX_THRESHOLD, | ||
| ReconServerConfigKeys.OZONE_RECON_CONTAINER_KEY_FLUSH_TO_DB_MAX_THRESHOLD_DEFAULT); | ||
| boolean result = ContainerKeyMapperHelper.reprocess( | ||
| omMetadataManager, reconContainerMetadataManager, BucketLayout.OBJECT_STORE, getTaskName(), | ||
| containerKeyFlushToDBMaxThreshold); | ||
| return buildTaskResult(result); | ||
| } | ||
|
|
||
| @Override | ||
| public String getTaskName() { | ||
| return "ContainerKeyMapperTaskOBS"; | ||
| } | ||
|
|
||
| @Override | ||
| public TaskResult process(OMUpdateEventBatch events, Map<String, Integer> subTaskSeekPosMap) { | ||
| boolean result = ContainerKeyMapperHelper.process(events, "keyTable", reconContainerMetadataManager, getTaskName()); | ||
| return buildTaskResult(result); | ||
| } | ||
| } |
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
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.