sumitagrawl commented on code in PR #4626:
URL: https://github.com/apache/ozone/pull/4626#discussion_r1229275329
##########
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java:
##########
@@ -245,9 +249,10 @@ public boolean reprocessWithLegacy(OMMetadataManager
omMetadataManager) {
.setObjectID(keyInfo.getObjectID())
.setParentObjectID(keyInfo.getParentObjectID())
.build();
- handlePutDirEvent(directoryInfo, nsSummaryMap);
+ handlePutDirEvent(directoryInfo, nsSummaryMap, null, 0L);
Review Comment:
for status with 1L or 0L, we can use constant / enum to have meaning
##########
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconNamespaceSummaryManagerImpl.java:
##########
@@ -23,28 +23,33 @@
import org.apache.hadoop.hdds.utils.db.RDBBatchOperation;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.ozone.recon.api.types.NSSummary;
+import org.apache.hadoop.ozone.recon.api.types.OrphanKeyMetaData;
import org.apache.hadoop.ozone.recon.spi.ReconNamespaceSummaryManager;
-import static
org.apache.hadoop.ozone.recon.spi.impl.ReconDBProvider.truncateTable;
import javax.inject.Inject;
-import static
org.apache.hadoop.ozone.recon.spi.impl.ReconDBDefinition.NAMESPACE_SUMMARY;
-
import java.io.IOException;
+import static
org.apache.hadoop.ozone.recon.spi.impl.ReconDBDefinition.NAMESPACE_SUMMARY;
+import static
org.apache.hadoop.ozone.recon.spi.impl.ReconDBDefinition.ORPHAN_KEYS_METADATA;
+import static
org.apache.hadoop.ozone.recon.spi.impl.ReconDBProvider.truncateTable;
Review Comment:
We can avoid static method import
##########
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OrphanMetaDataManagementTask.java:
##########
@@ -0,0 +1,263 @@
+/*
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.hadoop.hdds.utils.db.DBStore;
+import org.apache.hadoop.hdds.utils.db.Table;
+import org.apache.hadoop.hdds.utils.db.TableIterator;
+import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
+import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
+import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
+import org.apache.hadoop.ozone.om.helpers.WithObjectID;
+import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
+import org.apache.hadoop.ozone.recon.api.types.NSSummary;
+import org.apache.hadoop.ozone.recon.api.types.OrphanKeyMetaData;
+import org.apache.hadoop.ozone.recon.recovery.ReconOMMetadataManager;
+import org.apache.hadoop.ozone.recon.spi.ReconNamespaceSummaryManager;
+import org.apache.hadoop.ozone.recon.spi.impl.ReconDBProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
+import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.BUCKET_TABLE;
+import static
org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DELETED_DIR_TABLE;
+import static
org.apache.hadoop.ozone.recon.spi.impl.ReconDBDefinition.ORPHAN_KEYS_METADATA;
+
+/**
+ * Task class to iterate over the OM DB and management of orphan_keys_metadata
+ * table data.
+ */
+public class OrphanMetaDataManagementTask implements ReconOmTask {
Review Comment:
add test case for this class
##########
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskDbEventHandler.java:
##########
@@ -82,23 +106,72 @@ protected void writeNSSummariesToDB(Map<Long, NSSummary>
nsSummaryMap)
e);
}
});
- reconNamespaceSummaryManager.commitBatchOperation(rdbBatchOperation);
+ try {
+ reconNamespaceSummaryManager.commitBatchOperation(rdbBatchOperation);
+ } catch (IOException e) {
+ LOG.error("Failed to commit batch operation for writing NSSummary " +
+ "data in Recon DB.", e);
+ throw e;
+ }
+ }
+ }
+
+ protected void writeOrphanKeysMetaDataToDB(
+ Map<Long, OrphanKeyMetaData> orphanKeyMetaDataMap, long status)
+ throws IOException {
+ try (RDBBatchOperation rdbBatchOperation = new RDBBatchOperation()) {
+ for (Map.Entry<Long, OrphanKeyMetaData> entry :
+ orphanKeyMetaDataMap.entrySet()) {
+ try {
+ Long key = entry.getKey();
+ OrphanKeyMetaData orphanKeyMetaData =
+ orphanKeyMetaDataMap.get(key);
+ if (orphanKeyMetaData.getObjectIds().size() > 0) {
+ orphanKeyMetaData.setStatus(status);
+ reconNamespaceSummaryManager.batchStoreOrphanKeyMetaData(
+ rdbBatchOperation, key, orphanKeyMetaData);
+ } else {
+ orphanKeyMetaDataMap.remove(key);
Review Comment:
the deletion is only from map, check if deletion while iterating map works
here. Need delete from table also.
##########
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OrphanMetaDataManagementTask.java:
##########
@@ -0,0 +1,263 @@
+/*
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.hadoop.hdds.utils.db.DBStore;
+import org.apache.hadoop.hdds.utils.db.Table;
+import org.apache.hadoop.hdds.utils.db.TableIterator;
+import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
+import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
+import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
+import org.apache.hadoop.ozone.om.helpers.WithObjectID;
+import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
+import org.apache.hadoop.ozone.recon.api.types.NSSummary;
+import org.apache.hadoop.ozone.recon.api.types.OrphanKeyMetaData;
+import org.apache.hadoop.ozone.recon.recovery.ReconOMMetadataManager;
+import org.apache.hadoop.ozone.recon.spi.ReconNamespaceSummaryManager;
+import org.apache.hadoop.ozone.recon.spi.impl.ReconDBProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
+import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.BUCKET_TABLE;
+import static
org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DELETED_DIR_TABLE;
+import static
org.apache.hadoop.ozone.recon.spi.impl.ReconDBDefinition.ORPHAN_KEYS_METADATA;
+
+/**
+ * Task class to iterate over the OM DB and management of orphan_keys_metadata
+ * table data.
+ */
+public class OrphanMetaDataManagementTask implements ReconOmTask {
+
+ private static final Logger LOG =
+ LoggerFactory.getLogger(OrphanMetaDataManagementTask.class);
+ private final DBStore reconDbStore;
+ private ReconNamespaceSummaryManager reconNamespaceSummaryManager;
+ private final ReconOMMetadataManager reconOMMetadataManager;
+ private final Table<Long, OrphanKeyMetaData> orphanKeysMetaDataTable;
+
+ @Inject
+ public OrphanMetaDataManagementTask(
+ ReconDBProvider reconDBProvider,
+ ReconNamespaceSummaryManager reconNamespaceSummaryManager,
+ ReconOMMetadataManager reconOMMetadataManager)
+ throws IOException {
+ this.reconDbStore = reconDBProvider.getDbStore();
+ this.reconNamespaceSummaryManager = reconNamespaceSummaryManager;
+ this.reconOMMetadataManager = reconOMMetadataManager;
+ this.orphanKeysMetaDataTable =
+ ORPHAN_KEYS_METADATA.getTable(reconDbStore);
+ }
+
+ @Override
+ public String getTaskName() {
+ return "OrphanMetaDataManagementTask";
+ }
+
+ public Collection<String> getTaskTables() {
+ List<String> taskTables = new ArrayList<>();
+ taskTables.add(DELETED_DIR_TABLE);
+ taskTables.add(BUCKET_TABLE);
+ return taskTables;
+ }
+
+ /**
+ * Process a set of OM events on tables that the task is listening on.
+ *
+ * @param events Set of events to be processed by the task.
+ * @return Pair of task name -> task success.
+ */
+ @Override
+ public Pair<String, Boolean> process(OMUpdateEventBatch events) {
+ Iterator<OMDBUpdateEvent> eventIterator = events.getIterator();
+ final Collection<String> taskTables = getTaskTables();
+ while (eventIterator.hasNext()) {
+ OMDBUpdateEvent<String, ? extends
+ WithObjectID> omdbUpdateEvent = eventIterator.next();
+ OMDBUpdateEvent.OMDBUpdateAction action = omdbUpdateEvent.getAction();
+ // we only process updates on OM's deletedDirectoryTable
+ String table = omdbUpdateEvent.getTable();
+ if (!taskTables.contains(table)) {
+ continue;
+ }
+
+ try {
+ if (table.equals(DELETED_DIR_TABLE)) {
+ // key update on deletedDirectoryTable
+ OMDBUpdateEvent<String, OmKeyInfo> deletedDirTableUpdateEvent =
+ (OMDBUpdateEvent<String, OmKeyInfo>) omdbUpdateEvent;
+ OmKeyInfo updatedKeyInfo = deletedDirTableUpdateEvent.getValue();
+
+ switch (action) {
+ case PUT:
+ handlePutDeleteDirEvent(updatedKeyInfo);
+ break;
+ case DELETE:
+ handleDeleteEvent(updatedKeyInfo.getObjectID(),
+ updatedKeyInfo.getParentObjectID(),
+ updatedKeyInfo.getKeyName());
+ break;
+ case UPDATE:
+ break;
+ default:
+ LOG.debug("Skipping DB update event : {}",
+ omdbUpdateEvent.getAction());
+ }
+ }
+ if (table.equals(BUCKET_TABLE)) {
+ // key update on Bucket Table
+ OMDBUpdateEvent<String, OmBucketInfo> bucketTableUpdateEvent =
+ (OMDBUpdateEvent<String, OmBucketInfo>) omdbUpdateEvent;
+ OmBucketInfo updatedBucketInfo = bucketTableUpdateEvent.getValue();
+
+ switch (action) {
+ case PUT:
+ case UPDATE:
+ break;
+ case DELETE:
+ String dbVolumeKey = reconOMMetadataManager.getVolumeKey(
+ updatedBucketInfo.getVolumeName());
+ OmVolumeArgs volumeArgs =
+ reconOMMetadataManager.getVolumeTable().get(dbVolumeKey);
+ String keyName =
+ StringUtils.join(OM_KEY_PREFIX, volumeArgs.getObjectID(),
+ OM_KEY_PREFIX, updatedBucketInfo.getObjectID());
+ handleDeleteEvent(updatedBucketInfo.getObjectID(),
+ volumeArgs.getObjectID(), keyName);
+ break;
+ default:
+ LOG.debug("Skipping DB update event : {}",
+ omdbUpdateEvent.getAction());
+ }
+ }
+ } catch (Exception ex) {
+ LOG.error("Unable to process Namespace Summary data in Recon DB. ",
ex);
+ return new ImmutablePair<>(getTaskName(), false);
+ }
+ }
+ return new ImmutablePair<>(getTaskName(), true);
+ }
+
+ private void removeOrphanMetaData(long objectID) throws IOException {
+ orphanKeysMetaDataTable.delete(objectID);
+ }
+
+ private void handlePutDeleteDirEvent(OmKeyInfo updatedKeyInfo)
+ throws IOException {
+ long objectID = updatedKeyInfo.getObjectID();
Review Comment:
add comment,
// for cases where parent is not present and moved to deleted table, still
sub-files and sub-directory can not be marked as orphans, so its removed from
orphan map
##########
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithFSO.java:
##########
@@ -155,51 +177,75 @@ public boolean processWithFSO(OMUpdateEventBatch events) {
if (!checkAndCallFlushToDB(nsSummaryMap)) {
return false;
}
+
+ if (!checkOrphanDataAndCallWriteFlushToDB(orphanKeysMetaDataSetMap, 1L))
{
+ return false;
+ }
}
// flush and commit left out entries at end
if (!flushAndCommitNSToDB(nsSummaryMap)) {
return false;
}
+ // flush and commit left out entries at end
+ if (!writeFlushAndCommitOrphanKeysMetaDataToDB(orphanKeysMetaDataSetMap,
+ 1L)) {
+ return false;
+ }
LOG.info("Completed a process run of NSSummaryTaskWithFSO");
return true;
}
public boolean reprocessWithFSO(OMMetadataManager omMetadataManager) {
Map<Long, NSSummary> nsSummaryMap = new HashMap<>();
+ Map<Long, OrphanKeyMetaData> orphanKeyMetaDataMap = new HashMap<>();
try {
- Table<String, OmDirectoryInfo> dirTable =
- omMetadataManager.getDirectoryTable();
- try (TableIterator<String,
- ? extends Table.KeyValue<String, OmDirectoryInfo>>
- dirTableIter = dirTable.iterator()) {
- while (dirTableIter.hasNext()) {
- Table.KeyValue<String, OmDirectoryInfo> kv = dirTableIter.next();
- OmDirectoryInfo directoryInfo = kv.getValue();
- handlePutDirEvent(directoryInfo, nsSummaryMap);
- if (!checkAndCallFlushToDB(nsSummaryMap)) {
- return false;
- }
- }
+ if (handleDirectoryTableEvents(omMetadataManager, nsSummaryMap,
+ orphanKeyMetaDataMap)) {
+ return false;
}
- // Get fileTable used by FSO
- Table<String, OmKeyInfo> keyTable =
- omMetadataManager.getFileTable();
-
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
- keyTableIter = keyTable.iterator()) {
- while (keyTableIter.hasNext()) {
- Table.KeyValue<String, OmKeyInfo> kv = keyTableIter.next();
- OmKeyInfo keyInfo = kv.getValue();
- handlePutKeyEvent(keyInfo, nsSummaryMap);
- if (!checkAndCallFlushToDB(nsSummaryMap)) {
- return false;
- }
- }
+ if (handleFileTableEvents(omMetadataManager, nsSummaryMap,
+ orphanKeyMetaDataMap)) {
+ return false;
+ }
+
+ if (!writeFlushAndCommitOrphanKeysMetaDataToDB(
+ orphanKeyMetaDataMap, 1L)) {
+ return false;
+ }
+
+ Set<Long> bucketObjIdSet = new HashSet<>();
+ buildBucketObjIdSet(omMetadataManager, bucketObjIdSet);
+
+ List<Long> orphanMetaDataKeyList = new ArrayList<>();
+ LOG.info("Starting to verify orphan key candidates...");
+ // If any deleted directory is present as parent key in
+ // orphanKeysMetaDataTable, then remove that parent directory entry
+ // from orphanKeysMetaDataTable, because child keys for deleted directory
+ // will not be treated as orphans.
+ Instant start = Instant.now();
+ if (removeDeletedDirEntries(omMetadataManager, orphanMetaDataKeyList)) {
Review Comment:
from method name, if success should return true, same for
handleFileTableEvents, handleDirectoryTableEvents, removeDeletedDirEntries,
verifyOrphanParentsForBucket returns true for failure case.
##########
hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskDbEventHandler.java:
##########
@@ -181,10 +276,38 @@ protected void handleDeleteKeyEvent(OmKeyInfo keyInfo,
--fileBucket[binIndex];
nsSummary.setFileSizeBucket(fileBucket);
nsSummaryMap.put(parentObjectId, nsSummary);
+ removeOrphanChild(keyInfo, orphanKeyMetaDataMap);
}
- protected void handleDeleteDirEvent(OmDirectoryInfo directoryInfo,
- Map<Long, NSSummary> nsSummaryMap)
+ private <T extends WithParentObjectId> void removeOrphanChild(
+ T fileDirObjInfo,
+ Map<Long, OrphanKeyMetaData> orphanKeyMetaDataMap) throws IOException {
+ if (null != orphanKeyMetaDataMap) {
+ long objectID = fileDirObjInfo.getObjectID();
+ long parentObjectID = fileDirObjInfo.getParentObjectID();
+ OrphanKeyMetaData orphanKeyMetaData =
+ orphanKeyMetaDataMap.get(parentObjectID);
+ if (null == orphanKeyMetaData) {
+ orphanKeyMetaData =
+ reconNamespaceSummaryManager.getOrphanKeyMetaData(
+ parentObjectID);
+ }
+ if (null != orphanKeyMetaData) {
+ Set<Long> objectIds = orphanKeyMetaData.getObjectIds();
+ objectIds.remove(objectID);
+ if (objectIds.size() > 0) {
+ orphanKeyMetaDataMap.put(parentObjectID, orphanKeyMetaData);
+ } else {
+ orphanKeyMetaDataMap.remove(parentObjectID);
Review Comment:
removing from map is not enough, need update Db table also, May be no need
remove from here, but when we commit and size is "0', than time can be removal
event.
--
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]
