diff --git src/test/data/hbase-4388-root.dir.README src/test/data/hbase-4388-root.dir.README new file mode 100644 index 0000000..10fea3b --- /dev/null +++ src/test/data/hbase-4388-root.dir.README @@ -0,0 +1,27 @@ +/** + * Copyright 2010 The Apache Software Foundation + * + * 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. + */ + +TestMetaMigrationRemovingHTD uses the file hbase-4388-root.dir.tgz for testing +upgrade to 0.92 from 0.90 cluster data. The files are untarred to the local +filesystem, and copied over to a minidfscluster. However, since the directory +name .META. causes problems on Windows, it has been renamed to -META- inside +the .tgz file. After untarring and copying the contents to minidfs, +TestMetaMigrationRemovingHTD.setUpBeforeClass() renames the file back to .META. +See https://issues.apache.org/jira/browse/HBASE-6821. diff --git src/test/data/hbase-4388-root.dir.tgz src/test/data/hbase-4388-root.dir.tgz index da2244e..bbcc79a 100644 Binary files src/test/data/hbase-4388-root.dir.tgz and src/test/data/hbase-4388-root.dir.tgz differ diff --git src/test/java/org/apache/hadoop/hbase/client/TestMetaMigrationRemovingHTD.java src/test/java/org/apache/hadoop/hbase/client/TestMetaMigrationRemovingHTD.java index 34e9956..38ff108 100644 --- src/test/java/org/apache/hadoop/hbase/client/TestMetaMigrationRemovingHTD.java +++ src/test/java/org/apache/hadoop/hbase/client/TestMetaMigrationRemovingHTD.java @@ -84,6 +84,11 @@ public class TestMetaMigrationRemovingHTD { } doFsCommand(shell, new String [] {"-put", untar.toURI().toString(), hbaseRootDir.toString()}); + //windows fix: tgz file has .META. directory renamed as -META- since the original is an illegal + //name under windows. So we rename it back. See src/test/data//hbase-4388-root.dir.README and + //https://issues.apache.org/jira/browse/HBASE-6821 + doFsCommand(shell, new String [] {"-mv", new Path(hbaseRootDir, "-META-").toString(), + new Path(hbaseRootDir, ".META.").toString()}); // See whats in minihdfs. doFsCommand(shell, new String [] {"-lsr", "/"}); TEST_UTIL.startMiniHBaseCluster(1, 1);