Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-8893 Verify that HTableDescriptor Properties are preserved when cloning 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1501126 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
mbertozzi 2013-07-09 08:27:04 +00:00
parent 4b68b915c4
commit 8191fe5cc4
1 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java
View File

@ -21,6 +21,9 @@ package org.apache.hadoop.hbase.client;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
@ -64,19 +67,23 @@ public class TestSnapshotMetadata {
private static final String BLOOMFILTER_FAM_STR = "fam_bloomfilter"; private static final String BLOOMFILTER_FAM_STR = "fam_bloomfilter";
private static final byte[] BLOOMFILTER_FAM = Bytes.toBytes(BLOOMFILTER_FAM_STR); private static final byte[] BLOOMFILTER_FAM = Bytes.toBytes(BLOOMFILTER_FAM_STR);
byte[][] families = { MAX_VERSIONS_FAM, BLOOMFILTER_FAM, COMPRESSED_FAM, BLOCKSIZE_FAM }; private static final String TEST_CONF_CUSTOM_VALUE = "TestCustomConf";
private static final String TEST_CUSTOM_VALUE = "TestCustomValue";
private static final byte[][] families = {
MAX_VERSIONS_FAM, BLOOMFILTER_FAM, COMPRESSED_FAM, BLOCKSIZE_FAM
};
private static final DataBlockEncoding DATA_BLOCK_ENCODING_TYPE = DataBlockEncoding.FAST_DIFF; private static final DataBlockEncoding DATA_BLOCK_ENCODING_TYPE = DataBlockEncoding.FAST_DIFF;
private static final BloomType BLOOM_TYPE = BloomType.ROW; private static final BloomType BLOOM_TYPE = BloomType.ROW;
private static final int BLOCK_SIZE = 98; private static final int BLOCK_SIZE = 98;
private static final int MAX_VERSIONS = 8; private static final int MAX_VERSIONS = 8;
HBaseAdmin admin; private HBaseAdmin admin;
private String originalTableDescription; private String originalTableDescription;
private HTableDescriptor originalTableDescriptor; private HTableDescriptor originalTableDescriptor;
byte[] originalTableName; private byte[] originalTableName;
String originalTableNameAsString; private String originalTableNameAsString;
private static FileSystem fs; private static FileSystem fs;
private static Path rootDir; private static Path rootDir;
@ -87,7 +94,6 @@ public class TestSnapshotMetadata {
UTIL.startMiniCluster(NUM_RS); UTIL.startMiniCluster(NUM_RS);
fs = UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getFileSystem(); fs = UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getFileSystem();
rootDir = UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getRootDir(); rootDir = UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getRootDir();
} }
@ -151,13 +157,16 @@ public class TestSnapshotMetadata {
htd.addFamily(bloomFilterColumn); htd.addFamily(bloomFilterColumn);
htd.addFamily(dataBlockColumn); htd.addFamily(dataBlockColumn);
htd.addFamily(blockSizeColumn); htd.addFamily(blockSizeColumn);
htd.setValue(TEST_CUSTOM_VALUE, TEST_CUSTOM_VALUE);
htd.setConfiguration(TEST_CONF_CUSTOM_VALUE, TEST_CONF_CUSTOM_VALUE);
assertTrue(htd.getConfiguration().size() > 0);
admin.createTable(htd); admin.createTable(htd);
HTable original = new HTable(UTIL.getConfiguration(), originalTableName); HTable original = new HTable(UTIL.getConfiguration(), originalTableName);
originalTableNameAsString = sourceTableNameAsString; originalTableNameAsString = sourceTableNameAsString;
originalTableDescriptor = original.getTableDescriptor(); originalTableDescriptor = admin.getTableDescriptor(originalTableName);
originalTableDescription = originalTableDescriptor.toString(); originalTableDescription = originalTableDescriptor.toStringCustomizedValues();
original.close(); original.close();
} }
@ -178,7 +187,6 @@ public class TestSnapshotMetadata {
// restore the snapshot into a cloned table and examine the output // restore the snapshot into a cloned table and examine the output
List<byte[]> familiesList = new ArrayList<byte[]>(); List<byte[]> familiesList = new ArrayList<byte[]>();
for (byte[] family : families) { for (byte[] family : families) {
familiesList.add(family); familiesList.add(family);
} }
@ -188,9 +196,20 @@ public class TestSnapshotMetadata {
admin.cloneSnapshot(snapshotName, clonedTableName); admin.cloneSnapshot(snapshotName, clonedTableName);
HTable clonedTable = new HTable(UTIL.getConfiguration(), clonedTableName); HTable clonedTable = new HTable(UTIL.getConfiguration(), clonedTableName);
Assert.assertEquals( HTableDescriptor cloneHtd = admin.getTableDescriptor(clonedTableName);
assertEquals(
originalTableDescription.replace(originalTableNameAsString, clonedTableNameAsString), originalTableDescription.replace(originalTableNameAsString, clonedTableNameAsString),
clonedTable.getTableDescriptor().toString()); cloneHtd.toStringCustomizedValues());
// Verify the custom fields
assertEquals(originalTableDescriptor.getValues().size(),
cloneHtd.getValues().size());
assertEquals(originalTableDescriptor.getConfiguration().size(),
cloneHtd.getConfiguration().size());
assertEquals(cloneHtd.getValue(TEST_CUSTOM_VALUE), TEST_CUSTOM_VALUE);
assertEquals(cloneHtd.getConfigurationValue(TEST_CONF_CUSTOM_VALUE), TEST_CONF_CUSTOM_VALUE);
assertEquals(originalTableDescriptor.getValues(), cloneHtd.getValues());
assertEquals(originalTableDescriptor.getConfiguration(), cloneHtd.getConfiguration());
admin.enableTable(originalTableName); admin.enableTable(originalTableName);
clonedTable.close(); clonedTable.close();
@ -246,7 +265,6 @@ public class TestSnapshotMetadata {
for (byte[] family : families) { for (byte[] family : families) {
if (family != familyForUpdate) { if (family != familyForUpdate) {
emptyFamiliesList.add(family); emptyFamiliesList.add(family);
} }
} }
@ -274,9 +292,10 @@ public class TestSnapshotMetadata {
admin.disableTable(originalTableName); admin.disableTable(originalTableName);
HColumnDescriptor hcd = new HColumnDescriptor(newFamilyName); HColumnDescriptor hcd = new HColumnDescriptor(newFamilyName);
admin.addColumn(originalTableName, hcd); admin.addColumn(originalTableName, hcd);
Assert.assertTrue("New column family was not added.", assertTrue("New column family was not added.",
admin.getTableDescriptor(originalTableName).toString().contains(newFamilyNameAsString)); admin.getTableDescriptor(originalTableName).toString().contains(newFamilyNameAsString));
} }
// restore it // restore it
if (!admin.isTableDisabled(originalTableName)) { if (!admin.isTableDisabled(originalTableName)) {
admin.disableTable(originalTableName); admin.disableTable(originalTableName);
@ -285,13 +304,11 @@ public class TestSnapshotMetadata {
admin.restoreSnapshot(snapshotName); admin.restoreSnapshot(snapshotName);
admin.enableTable(originalTableName); admin.enableTable(originalTableName);
HTable original = new HTable(UTIL.getConfiguration(), originalTableName);
// verify that the descrption is reverted // verify that the descrption is reverted
HTable original = new HTable(UTIL.getConfiguration(), originalTableName);
try { try {
Assert assertTrue(originalTableDescriptor.equals(admin.getTableDescriptor(originalTableName)));
.assertTrue(originalTableDescriptor.equals(admin.getTableDescriptor(originalTableName))); assertTrue(originalTableDescriptor.equals(original.getTableDescriptor()));
Assert.assertTrue(originalTableDescriptor.equals(original.getTableDescriptor()));
} finally { } finally {
original.close(); original.close();
} }