-
Notifications
You must be signed in to change notification settings - Fork 538
HDDS-11747. Add debug CLI to show full path of keys present in specific containers #7465
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
Changes from 9 commits
9f94626
4fc7163
c33d089
70ec1aa
e7fbb18
f38a5a8
dc918bd
5b4f1fd
dacdade
755eb3c
7b07268
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -33,9 +33,12 @@ | |||||||||||||
import org.apache.hadoop.ozone.MiniOzoneCluster; | ||||||||||||||
import org.apache.hadoop.ozone.OzoneTestUtils; | ||||||||||||||
import org.apache.hadoop.ozone.TestDataUtil; | ||||||||||||||
import org.apache.hadoop.ozone.client.OzoneBucket; | ||||||||||||||
import org.apache.hadoop.ozone.client.OzoneClient; | ||||||||||||||
import org.apache.hadoop.ozone.client.OzoneClientFactory; | ||||||||||||||
import org.apache.hadoop.ozone.client.OzoneKeyDetails; | ||||||||||||||
import org.apache.hadoop.ozone.client.OzoneSnapshot; | ||||||||||||||
import org.apache.hadoop.ozone.debug.KeyPathRetriever; | ||||||||||||||
import org.apache.hadoop.ozone.debug.OzoneDebug; | ||||||||||||||
import org.apache.hadoop.ozone.debug.ldb.RDBParser; | ||||||||||||||
import org.apache.hadoop.ozone.om.OMConfigKeys; | ||||||||||||||
|
@@ -175,6 +178,37 @@ public void testLdbCliForOzoneSnapshot() throws Exception { | |||||||||||||
assertThat(cmdOut).contains(keyName); | ||||||||||||||
} | ||||||||||||||
|
||||||||||||||
@Test | ||||||||||||||
public void testKeyPathRetriever() throws Exception { | ||||||||||||||
final String volumeName = UUID.randomUUID().toString(); | ||||||||||||||
final String bucketName = UUID.randomUUID().toString(); | ||||||||||||||
StringWriter stdout = new StringWriter(); | ||||||||||||||
PrintWriter pstdout = new PrintWriter(stdout); | ||||||||||||||
String[] args; | ||||||||||||||
CommandLine cmd; | ||||||||||||||
try (OzoneClient client = OzoneClientFactory.getRpcClient(conf)) { | ||||||||||||||
TestDataUtil.createVolumeAndBucket(client, volumeName, bucketName, BucketLayout.FILE_SYSTEM_OPTIMIZED); | ||||||||||||||
OzoneBucket bucket = client.getObjectStore().getVolume(volumeName).getBucket(bucketName); | ||||||||||||||
bucket.createDirectory("dir1"); | ||||||||||||||
TestDataUtil.createKey(bucket, "dir1/file1", "test"); | ||||||||||||||
TestDataUtil.createKey(bucket, "dir1/file2", "test"); | ||||||||||||||
TestDataUtil.createKey(bucket, "dir1/file3", "test"); | ||||||||||||||
OzoneKeyDetails key1 = bucket.getKey("dir1/file1"); | ||||||||||||||
OzoneKeyDetails key3 = bucket.getKey("dir1/file2"); | ||||||||||||||
StringBuilder sb = new StringBuilder(); | ||||||||||||||
key1.getOzoneKeyLocations().forEach(e -> sb.append(e.getContainerID())); | ||||||||||||||
key3.getOzoneKeyLocations().forEach(e -> sb.append(",").append(e.getContainerID())); | ||||||||||||||
Comment on lines
+196
to
+198
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This does not produce the expected output if String containers = Stream.concat(key1.getOzoneKeyLocations().stream(), key3.getOzoneKeyLocations().stream())
.mapToLong(OzoneKeyLocation::getContainerID)
.mapToObj(String::valueOf)
.collect(Collectors.joining(",")); |
||||||||||||||
String dbFile = OMStorage.getOmDbDir(conf).getPath() + "/om.db"; | ||||||||||||||
cmd = new CommandLine(new OzoneDebug()).addSubcommand(new CommandLine(new KeyPathRetriever())).setOut(pstdout); | ||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do not add subcommand manually.
Suggested change
|
||||||||||||||
args = new String[] {"retrieve-key-fullpath", "--db", dbFile, "--containers", sb.toString()}; | ||||||||||||||
} | ||||||||||||||
int exitCode = cmd.execute(args); | ||||||||||||||
assertEquals(0, exitCode); | ||||||||||||||
String keyPrefix = volumeName + "/" + bucketName + "/dir1/"; | ||||||||||||||
assertThat(stdout.toString()).contains(keyPrefix + "file1").contains(keyPrefix + "file2") | ||||||||||||||
.doesNotContain(keyPrefix + "file3"); | ||||||||||||||
Comment on lines
+206
to
+207
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: please wrap.
Suggested change
|
||||||||||||||
} | ||||||||||||||
|
||||||||||||||
private static String getSnapshotDBPath(String checkPointDir) { | ||||||||||||||
return OMStorage.getOmDbDir(conf) + | ||||||||||||||
OM_KEY_PREFIX + OM_SNAPSHOT_CHECKPOINT_DIR + OM_KEY_PREFIX + | ||||||||||||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,281 @@ | ||
/* | ||
* 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.debug; | ||
|
||
import java.io.File; | ||
import java.io.IOException; | ||
import java.io.PrintWriter; | ||
import java.nio.file.Files; | ||
import java.nio.file.Paths; | ||
import java.util.HashMap; | ||
import java.util.HashSet; | ||
import java.util.Map; | ||
import java.util.Set; | ||
import java.util.concurrent.Callable; | ||
import java.util.stream.Stream; | ||
import org.apache.commons.io.FileUtils; | ||
import org.apache.commons.lang3.StringUtils; | ||
import org.apache.commons.lang3.tuple.Pair; | ||
import org.apache.hadoop.hdds.cli.DebugSubcommand; | ||
import org.apache.hadoop.hdds.conf.ConfigurationSource; | ||
import org.apache.hadoop.hdds.conf.OzoneConfiguration; | ||
import org.apache.hadoop.hdds.utils.db.DBColumnFamilyDefinition; | ||
import org.apache.hadoop.hdds.utils.db.DBStore; | ||
import org.apache.hadoop.hdds.utils.db.DBStoreBuilder; | ||
import org.apache.hadoop.hdds.utils.db.LongCodec; | ||
import org.apache.hadoop.hdds.utils.db.StringCodec; | ||
import org.apache.hadoop.hdds.utils.db.Table; | ||
import org.apache.hadoop.hdds.utils.db.Table.KeyValue; | ||
import org.apache.hadoop.hdds.utils.db.TableIterator; | ||
import org.apache.hadoop.ozone.om.OMMetadataManager; | ||
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl; | ||
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; | ||
import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo; | ||
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; | ||
import org.kohsuke.MetaInfServices; | ||
import picocli.CommandLine; | ||
|
||
import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX; | ||
|
||
/** | ||
* Tool that retrieve key full path from OM db file table with pattern match. | ||
*/ | ||
@CommandLine.Command( | ||
name = "retrieve-key-fullpath", | ||
description = "retrieve full key path with matching criteria") | ||
@MetaInfServices(DebugSubcommand.class) | ||
public class KeyPathRetriever implements Callable<Void>, DebugSubcommand { | ||
private static final String DIRTREEDBNAME = "omdirtree.db"; | ||
private static final DBColumnFamilyDefinition<Long, String> DIRTREE_COLUMN_FAMILY | ||
= new DBColumnFamilyDefinition<>("dirTreeTable", LongCodec.get(), StringCodec.get()); | ||
|
||
@CommandLine.Spec | ||
private static CommandLine.Model.CommandSpec spec; | ||
|
||
@CommandLine.Option(names = {"--db"}, | ||
required = true, | ||
description = "Database File") | ||
private String dbFile; | ||
|
||
@CommandLine.Option(names = {"--containers"}, | ||
required = false, | ||
description = "Comma separated Container Ids") | ||
private String strContainerIds; | ||
|
||
@CommandLine.Option(names = {"--container-file"}, | ||
required = false, | ||
description = "file with container id in new line") | ||
private String containerFileName; | ||
sumitagrawl marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
private DBStore dirTreeDbStore = null; | ||
private Table<Long, String> dirTreeTable = null; | ||
|
||
public void setDirTreeTable(Table<Long, String> table) { | ||
this.dirTreeTable = table; | ||
} | ||
|
||
@Override | ||
public Void call() throws Exception { | ||
// get containerIds filter | ||
Set<Long> containerIds = new HashSet<>(); | ||
if (!StringUtils.isEmpty(strContainerIds)) { | ||
String[] split = strContainerIds.split(","); | ||
for (String id : split) { | ||
containerIds.add(Long.parseLong(id)); | ||
} | ||
} else if (!StringUtils.isEmpty(containerFileName)) { | ||
try (Stream<String> stream = Files.lines(Paths.get(containerFileName))) { | ||
stream.forEach(e -> containerIds.add(Long.parseLong(e))); | ||
} | ||
} | ||
if (containerIds.isEmpty()) { | ||
System.err.println("No containers to be filtered"); | ||
return null; | ||
} | ||
// out stream | ||
PrintWriter writer = out(); | ||
|
||
// db handler | ||
OMMetadataManager metadataManager = getOmMetadataManager(dbFile); | ||
if (metadataManager == null) { | ||
writer.close(); | ||
return null; | ||
} | ||
|
||
dirTreeDbStore = openDb(new File(dbFile).getParentFile()); | ||
if (dirTreeDbStore == null) { | ||
writer.close(); | ||
metadataManager.stop(); | ||
return null; | ||
} | ||
dirTreeTable = dirTreeDbStore.getTable(DIRTREE_COLUMN_FAMILY.getName(), Long.class, String.class); | ||
|
||
try { | ||
retrieve(metadataManager, writer, containerIds); | ||
} finally { | ||
dirTreeDbStore.close(); | ||
sumitagrawl marked this conversation as resolved.
Show resolved
Hide resolved
|
||
writer.close(); | ||
metadataManager.stop(); | ||
// delete temporary created db file | ||
File dirTreeDbPath = new File(new File(dbFile).getParentFile(), DIRTREEDBNAME); | ||
if (dirTreeDbPath.exists()) { | ||
FileUtils.deleteDirectory(dirTreeDbPath); | ||
} | ||
} | ||
return null; | ||
} | ||
|
||
public void retrieve( | ||
OMMetadataManager metadataManager, PrintWriter writer, Set<Long> containerIds) { | ||
errose28 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// build dir tree | ||
Map<Long, Pair<Long, String>> bucketVolMap = new HashMap<>(); | ||
try { | ||
prepareDirIdTree(metadataManager, bucketVolMap); | ||
} catch (Exception e) { | ||
System.err.println("Exception occurred reading directory Table, " + e); | ||
return; | ||
} | ||
|
||
// iterate file table and filter for container | ||
try (TableIterator<String, ? extends KeyValue<String, OmKeyInfo>> fileItr | ||
= metadataManager.getFileTable().iterator()) { | ||
while (fileItr.hasNext()) { | ||
KeyValue<String, OmKeyInfo> next = fileItr.next(); | ||
boolean found = next.getValue().getKeyLocationVersions().stream().anyMatch( | ||
e -> e.getLocationList().stream().anyMatch( | ||
blk -> containerIds.contains(blk.getBlockID().getContainerID()))); | ||
if (found) { | ||
StringBuilder sb = new StringBuilder(next.getValue().getKeyName()); | ||
Long prvParent = next.getValue().getParentObjectID(); | ||
while (prvParent != null) { | ||
// check reached for bucket volume level | ||
if (bucketVolMap.containsKey(prvParent)) { | ||
Pair<Long, String> nameParentPair = bucketVolMap.get(prvParent); | ||
sb.insert(0, nameParentPair.getValue() + OM_KEY_PREFIX); | ||
prvParent = nameParentPair.getKey(); | ||
if (null == prvParent) { | ||
// add to output as reached till volume | ||
writer.println(sb); | ||
break; | ||
} | ||
continue; | ||
} | ||
|
||
// check dir tree | ||
Pair<Long, String> nameParentPair = getFromDirTree(prvParent); | ||
if (nameParentPair == null) { | ||
break; | ||
} | ||
sb.insert(0, nameParentPair.getValue() + OM_KEY_PREFIX); | ||
prvParent = nameParentPair.getKey(); | ||
} | ||
} | ||
} | ||
} catch (IOException e) { | ||
System.err.println("Exception occurred reading file Table, " + e); | ||
} | ||
} | ||
|
||
private static OMMetadataManager getOmMetadataManager(String db) throws IOException { | ||
if (!Files.exists(Paths.get(db))) { | ||
System.err.println("DB with path not exist:" + db); | ||
return null; | ||
} | ||
System.err.println("Db Path is:" + db); | ||
File file = new File(db); | ||
|
||
OzoneConfiguration conf = new OzoneConfiguration(); | ||
return new OmMetadataManagerImpl(conf, file.getParentFile(), file.getName()); | ||
} | ||
|
||
private void prepareDirIdTree( | ||
OMMetadataManager metadataManager, Map<Long, Pair<Long, String>> bucketVolMap) throws IOException { | ||
// add bucket volume tree | ||
try (TableIterator<String, ? extends KeyValue<String, OmBucketInfo>> bucItr | ||
= metadataManager.getBucketTable().iterator()) { | ||
while (bucItr.hasNext()) { | ||
KeyValue<String, OmBucketInfo> next = bucItr.next(); | ||
bucketVolMap.put(next.getValue().getObjectID(), | ||
Pair.of(metadataManager.getVolumeId(next.getValue().getVolumeName()), next.getValue().getBucketName())); | ||
bucketVolMap.putIfAbsent(metadataManager.getVolumeId(next.getValue().getVolumeName()), | ||
Pair.of(null, next.getValue().getVolumeName())); | ||
} | ||
} | ||
// add dir tree | ||
try (TableIterator<String, ? extends KeyValue<String, OmDirectoryInfo>> dirItr | ||
= metadataManager.getDirectoryTable().iterator()) { | ||
while (dirItr.hasNext()) { | ||
KeyValue<String, OmDirectoryInfo> next = dirItr.next(); | ||
addToDirTree(next.getValue().getObjectID(), next.getValue().getParentObjectID(), next.getValue().getName()); | ||
} | ||
} | ||
} | ||
|
||
private DBStore openDb(File omPath) { | ||
File dirTreeDbPath = new File(omPath, DIRTREEDBNAME); | ||
System.err.println("Creating database of dir tree path at " + dirTreeDbPath); | ||
try { | ||
// Delete the DB from the last run if it exists. | ||
if (dirTreeDbPath.exists()) { | ||
FileUtils.deleteDirectory(dirTreeDbPath); | ||
} | ||
ConfigurationSource conf = new OzoneConfiguration(); | ||
DBStoreBuilder dbStoreBuilder = DBStoreBuilder.newBuilder(conf); | ||
dbStoreBuilder.setName(dirTreeDbPath.getName()); | ||
dbStoreBuilder.setPath(dirTreeDbPath.getParentFile().toPath()); | ||
dbStoreBuilder.addTable(DIRTREE_COLUMN_FAMILY.getName()); | ||
dbStoreBuilder.addCodec(DIRTREE_COLUMN_FAMILY.getKeyType(), DIRTREE_COLUMN_FAMILY.getKeyCodec()); | ||
dbStoreBuilder.addCodec(DIRTREE_COLUMN_FAMILY.getValueType(), DIRTREE_COLUMN_FAMILY.getValueCodec()); | ||
return dbStoreBuilder.build(); | ||
} catch (IOException e) { | ||
System.err.println("Error creating omdirtree.db " + e); | ||
return null; | ||
} | ||
} | ||
|
||
private void addToDirTree(Long objectId, Long parentId, String name) throws IOException { | ||
if (null == parentId) { | ||
dirTreeTable.put(objectId, name + "#"); | ||
} else { | ||
dirTreeTable.put(objectId, name + "#" + parentId); | ||
} | ||
} | ||
|
||
private Pair<Long, String> getFromDirTree(Long objectId) throws IOException { | ||
String val = dirTreeTable.get(objectId); | ||
if (null == val) { | ||
return null; | ||
} | ||
return getDirParentNamePair(val); | ||
} | ||
|
||
public static Pair<Long, String> getDirParentNamePair(String val) { | ||
int hashIdx = val.lastIndexOf('#'); | ||
String strParentId = val.substring(hashIdx + 1); | ||
Long parentId = null; | ||
if (!StringUtils.isEmpty(strParentId)) { | ||
parentId = Long.parseLong(strParentId); | ||
} | ||
return Pair.of(parentId, val.substring(0, hashIdx)); | ||
} | ||
|
||
private static PrintWriter out() { | ||
return spec.commandLine().getOut(); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit:
key3
vs.file2
is confusing, especially in final assertion, where we expectfile2
, but notfile3
.