smengcl commented on code in PR #3082:
URL: https://github.com/apache/ozone/pull/3082#discussion_r954133343
##########
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperTask.java:
##########
@@ -252,48 +253,54 @@ private void handleDeleteOMKeyEvent(String key,
List<ContainerKeyPrefix>
deletedContainerKeyList)
throws IOException {
+
Set<ContainerKeyPrefix> keysToBeDeleted = new HashSet<>();
- try (TableIterator<ContainerKeyPrefix,
- ? extends Table.KeyValue<ContainerKeyPrefix, Integer>>
containerIterator
- = reconContainerMetadataManager.getContainerTableIterator()) {
+ try (TableIterator<KeyPrefixContainer, ? extends
+ Table.KeyValue<KeyPrefixContainer, Integer>> keyContainerIterator =
+ reconContainerMetadataManager.getKeyContainerTableIterator()) {
// Check if we have keys in this container in the DB
- while (containerIterator.hasNext()) {
- Table.KeyValue<ContainerKeyPrefix, Integer> keyValue =
- containerIterator.next();
+ keyContainerIterator.seek(new KeyPrefixContainer(key));
+ while (keyContainerIterator.hasNext()) {
+ Table.KeyValue<KeyPrefixContainer, Integer> keyValue =
+ keyContainerIterator.next();
String keyPrefix = keyValue.getKey().getKeyPrefix();
if (keyPrefix.equals(key)) {
- keysToBeDeleted.add(keyValue.getKey());
+ if (keyValue.getKey().getContainerId() != -1) {
+ keysToBeDeleted.add(keyValue.getKey().toContainerKeyPrefix());
+ }
+ } else {
+ break;
}
}
- }
Review Comment:
Hi @symious , other changes looks good now. Can we move the closing bracket
(for the `try` clause) back here?
##########
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperTask.java:
##########
@@ -252,48 +253,54 @@ private void handleDeleteOMKeyEvent(String key,
List<ContainerKeyPrefix>
deletedContainerKeyList)
throws IOException {
+
Set<ContainerKeyPrefix> keysToBeDeleted = new HashSet<>();
- try (TableIterator<ContainerKeyPrefix,
- ? extends Table.KeyValue<ContainerKeyPrefix, Integer>>
containerIterator
- = reconContainerMetadataManager.getContainerTableIterator()) {
+ try (TableIterator<KeyPrefixContainer, ? extends
+ Table.KeyValue<KeyPrefixContainer, Integer>> keyContainerIterator =
+ reconContainerMetadataManager.getKeyContainerTableIterator()) {
// Check if we have keys in this container in the DB
- while (containerIterator.hasNext()) {
- Table.KeyValue<ContainerKeyPrefix, Integer> keyValue =
- containerIterator.next();
+ keyContainerIterator.seek(new KeyPrefixContainer(key));
+ while (keyContainerIterator.hasNext()) {
+ Table.KeyValue<KeyPrefixContainer, Integer> keyValue =
+ keyContainerIterator.next();
String keyPrefix = keyValue.getKey().getKeyPrefix();
if (keyPrefix.equals(key)) {
- keysToBeDeleted.add(keyValue.getKey());
+ if (keyValue.getKey().getContainerId() != -1) {
+ keysToBeDeleted.add(keyValue.getKey().toContainerKeyPrefix());
+ }
+ } else {
+ break;
}
}
- }
Review Comment:
Hi @symious , other changes look good now. Can we move the closing bracket
(for the `try` clause) back here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
