You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@ozone.apache.org by GitBox <gi...@apache.org> on 2021/04/27 05:00:04 UTC
[GitHub] [ozone] mukul1987 commented on a change in pull request #2185: HDDS-5097. [FSO] Cleanup integration tests and reduce the execution time
mukul1987 commented on a change in pull request #2185:
URL: https://github.com/apache/ozone/pull/2185#discussion_r620865719
##########
File path: hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneDirectory.java
##########
@@ -1,183 +0,0 @@
-/*
- * 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.fs.ozone;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.ozone.MiniOzoneCluster;
-import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.hadoop.ozone.TestDataUtil;
-import org.apache.hadoop.ozone.client.OzoneBucket;
-import org.apache.hadoop.ozone.om.OMConfigKeys;
-import org.apache.hadoop.ozone.om.OMMetadataManager;
-import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
-import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
-import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
-import org.apache.hadoop.util.StringUtils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.Timeout;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.concurrent.TimeoutException;
-
-import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.FS_TRASH_INTERVAL_KEY;
-import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_ITERATE_BATCH_SIZE;
-
-/**
- * Test verifies the entries and operations in directory table.
- */
-public class TestOzoneDirectory {
-
- @Rule
- public Timeout timeout = new Timeout(300000);
-
- private static final Logger LOG =
- LoggerFactory.getLogger(TestOzoneDirectory.class);
-
- private MiniOzoneCluster cluster;
- private FileSystem fs;
- private OzoneFileSystem o3fs;
- private String volumeName;
- private String bucketName;
-
- @Test(timeout = 300_000)
- public void testMultiLevelDirs() throws Exception {
- setupOzoneFileSystem();
- // Op 1. create dir -> /d1/d2/d3/d4/
- // Op 2. create dir -> /d1/d2/d3/d4/d5
- // Op 3. create dir -> /d1/d2/d3/d4/d6
- Path parent = new Path("/d1/d2/d3/d4/");
- fs.mkdirs(parent);
-
- OMMetadataManager omMgr = cluster.getOzoneManager().getMetadataManager();
- OmBucketInfo omBucketInfo = omMgr.getBucketTable().get(
- omMgr.getBucketKey(volumeName, bucketName));
- Assert.assertNotNull("Failed to find bucketInfo", omBucketInfo);
-
- ArrayList<String> dirKeys = new ArrayList<>();
- long d1ObjectID = verifyDirKey(omBucketInfo.getObjectID(), "d1", "/d1",
- dirKeys, omMgr);
- long d2ObjectID = verifyDirKey(d1ObjectID, "d2", "/d1/d2", dirKeys,
- omMgr);
- long d3ObjectID = verifyDirKey(d2ObjectID, "d3", "/d1/d2/d3",
- dirKeys, omMgr);
- long d4ObjectID = verifyDirKey(d3ObjectID, "d4", "/d1/d2/d3/d4",
- dirKeys, omMgr);
-
- Assert.assertEquals("Wrong OM numKeys metrics",
- 4, cluster.getOzoneManager().getMetrics().getNumKeys());
-
- // create sub-dirs under same parent
- Path subDir5 = new Path("/d1/d2/d3/d4/d5");
- fs.mkdirs(subDir5);
- Path subDir6 = new Path("/d1/d2/d3/d4/d6");
- fs.mkdirs(subDir6);
- long d5ObjectID = verifyDirKey(d4ObjectID, "d5",
- "/d1/d2/d3/d4/d5", dirKeys, omMgr);
- long d6ObjectID = verifyDirKey(d4ObjectID, "d6",
- "/d1/d2/d3/d4/d6", dirKeys, omMgr);
- Assert.assertTrue("Wrong objectIds for sub-dirs[" + d5ObjectID +
- "/d5, " + d6ObjectID + "/d6] of same parent!",
- d5ObjectID != d6ObjectID);
-
- Assert.assertEquals("Wrong OM numKeys metrics",
- 6, cluster.getOzoneManager().getMetrics().getNumKeys());
- }
-
- /**
- * Verify key name format and the DB key existence in the expected dirKeys
- * list.
- *
- * @param key table keyName
- * @param dirKeys expected keyName
- */
- private void verifyKeyFormat(String key, ArrayList<String> dirKeys) {
- String[] keyParts = StringUtils.split(key,
- OzoneConsts.OM_KEY_PREFIX.charAt(0));
- Assert.assertEquals("Invalid KeyName", 2, keyParts.length);
- boolean removed = dirKeys.remove(key);
- Assert.assertTrue("Key:" + key + " doesn't exists in directory table!",
- removed);
- }
-
- long verifyDirKey(long parentId, String dirKey, String absolutePath,
- ArrayList<String> dirKeys, OMMetadataManager omMgr)
- throws Exception {
- String dbKey = parentId + "/" + dirKey;
- dirKeys.add(dbKey);
- OmDirectoryInfo dirInfo = omMgr.getDirectoryTable().get(dbKey);
- Assert.assertNotNull("Failed to find " + absolutePath +
- " using dbKey: " + dbKey, dirInfo);
- Assert.assertEquals("Parent Id mismatches", parentId,
- dirInfo.getParentObjectID());
- Assert.assertEquals("Mismatches directory name", dirKey,
- dirInfo.getName());
- Assert.assertTrue("Mismatches directory creation time param",
- dirInfo.getCreationTime() > 0);
- Assert.assertEquals("Mismatches directory modification time param",
- dirInfo.getCreationTime(), dirInfo.getModificationTime());
- Assert.assertEquals("Wrong representation!",
- dbKey + ":" + dirInfo.getObjectID(), dirInfo.toString());
- return dirInfo.getObjectID();
- }
-
- private void setupOzoneFileSystem()
- throws IOException, TimeoutException, InterruptedException {
- OzoneConfiguration conf = new OzoneConfiguration();
- conf.setInt(FS_TRASH_INTERVAL_KEY, 1);
- TestOMRequestUtils.configureFSOptimizedPaths(conf,
- true, OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
- cluster = MiniOzoneCluster.newBuilder(conf)
- .setNumDatanodes(3)
- .build();
- cluster.waitForClusterToBeReady();
- // create a volume and a bucket to be used by OzoneFileSystem
- OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(cluster);
- volumeName = bucket.getVolumeName();
Review comment:
How is this tested now ? with the test removed ?
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@ozone.apache.org
For additional commands, e-mail: issues-help@ozone.apache.org