You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2016/03/05 08:06:52 UTC
[1/3] hadoop git commit: HADOOP-12717. NPE when trying to rename a
directory in Windows Azure Storage FileSystem. Contributed by Robert Yokota
and Gaurav Kanade.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 592f161e1 -> 2e6038740
refs/heads/branch-2.8 d5134dadb -> cb063d569
refs/heads/trunk 2759689d7 -> c50aad0f8
HADOOP-12717. NPE when trying to rename a directory in Windows Azure Storage FileSystem. Contributed by Robert Yokota and Gaurav Kanade.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c50aad0f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c50aad0f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c50aad0f
Branch: refs/heads/trunk
Commit: c50aad0f854b74ede9668e35db314b0a93be81b2
Parents: 2759689
Author: Chris Nauroth <cn...@apache.org>
Authored: Fri Mar 4 22:57:43 2016 -0800
Committer: Chris Nauroth <cn...@apache.org>
Committed: Fri Mar 4 22:57:43 2016 -0800
----------------------------------------------------------------------
.../fs/azure/AzureNativeFileSystemStore.java | 4 +-
...ativeAzureFileSystemAtomicRenameDirList.java | 49 ++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c50aad0f/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
index 7ccefd6..e261c4d 100644
--- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
+++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
@@ -450,7 +450,9 @@ public class AzureNativeFileSystemStore implements NativeFileSystemStore {
// Add to this the hbase root directory, or /hbase is that is not set.
hbaseRoot = verifyAndConvertToStandardFormat(
sessionConfiguration.get("hbase.rootdir", "hbase"));
- atomicRenameDirs.add(hbaseRoot);
+ if (hbaseRoot != null) {
+ atomicRenameDirs.add(hbaseRoot);
+ }
} catch (URISyntaxException e) {
LOG.warn("Unable to initialize HBase root as an atomic rename directory.");
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c50aad0f/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestNativeAzureFileSystemAtomicRenameDirList.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestNativeAzureFileSystemAtomicRenameDirList.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestNativeAzureFileSystemAtomicRenameDirList.java
new file mode 100644
index 0000000..b9cca25
--- /dev/null
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestNativeAzureFileSystemAtomicRenameDirList.java
@@ -0,0 +1,49 @@
+/**
+ * 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.azure;
+
+import java.io.IOException;
+import java.net.URI;
+
+import org.apache.hadoop.conf.Configuration;
+import org.junit.Test;
+
+public class TestNativeAzureFileSystemAtomicRenameDirList extends NativeAzureFileSystemBaseTest {
+ private AzureBlobStorageTestAccount testAccount;
+
+ // HBase-site config controlling HBase root dir
+ private static final String HBASE_ROOT_DIR_CONF_STRING = "hbase.rootdir";
+ private static final String HBASE_ROOT_DIR_VALUE_ON_DIFFERENT_FS = "wasb://somedifferentfilesystem.blob.core.windows.net/hbase";
+ @Override
+ protected AzureBlobStorageTestAccount createTestAccount() throws Exception {
+ testAccount = AzureBlobStorageTestAccount.create();
+ return testAccount;
+ }
+
+ @Test
+ public void testAzureNativeStoreIsAtomicRenameKeyDoesNotThrowNPEOnInitializingWithNonDefaultURI () throws IOException {
+ NativeAzureFileSystem azureFs = (NativeAzureFileSystem)fs;
+ AzureNativeFileSystemStore azureStore = azureFs.getStore();
+ Configuration conf = fs.getConf();
+ conf.set(HBASE_ROOT_DIR_CONF_STRING, HBASE_ROOT_DIR_VALUE_ON_DIFFERENT_FS);
+ URI uri = fs.getUri();
+ fs.initialize(uri, conf);
+ azureStore.isAtomicRenameKey("anyrandomkey");
+ }
+}
[3/3] hadoop git commit: HADOOP-12717. NPE when trying to rename a
directory in Windows Azure Storage FileSystem. Contributed by Robert Yokota
and Gaurav Kanade.
Posted by cn...@apache.org.
HADOOP-12717. NPE when trying to rename a directory in Windows Azure Storage FileSystem. Contributed by Robert Yokota and Gaurav Kanade.
(cherry picked from commit c50aad0f854b74ede9668e35db314b0a93be81b2)
(cherry picked from commit 2e60387401e1dff3fa36e32b267f2855c2e4ba49)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cb063d56
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cb063d56
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cb063d56
Branch: refs/heads/branch-2.8
Commit: cb063d56994dbd3c4567504ff6cff82571e6ffbd
Parents: d5134da
Author: Chris Nauroth <cn...@apache.org>
Authored: Fri Mar 4 22:57:43 2016 -0800
Committer: Chris Nauroth <cn...@apache.org>
Committed: Fri Mar 4 22:58:04 2016 -0800
----------------------------------------------------------------------
.../fs/azure/AzureNativeFileSystemStore.java | 4 +-
...ativeAzureFileSystemAtomicRenameDirList.java | 49 ++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cb063d56/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
index 7463bc3..cb3e9f6 100644
--- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
+++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
@@ -450,7 +450,9 @@ public class AzureNativeFileSystemStore implements NativeFileSystemStore {
// Add to this the hbase root directory, or /hbase is that is not set.
hbaseRoot = verifyAndConvertToStandardFormat(
sessionConfiguration.get("hbase.rootdir", "hbase"));
- atomicRenameDirs.add(hbaseRoot);
+ if (hbaseRoot != null) {
+ atomicRenameDirs.add(hbaseRoot);
+ }
} catch (URISyntaxException e) {
LOG.warn("Unable to initialize HBase root as an atomic rename directory.");
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cb063d56/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestNativeAzureFileSystemAtomicRenameDirList.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestNativeAzureFileSystemAtomicRenameDirList.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestNativeAzureFileSystemAtomicRenameDirList.java
new file mode 100644
index 0000000..b9cca25
--- /dev/null
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestNativeAzureFileSystemAtomicRenameDirList.java
@@ -0,0 +1,49 @@
+/**
+ * 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.azure;
+
+import java.io.IOException;
+import java.net.URI;
+
+import org.apache.hadoop.conf.Configuration;
+import org.junit.Test;
+
+public class TestNativeAzureFileSystemAtomicRenameDirList extends NativeAzureFileSystemBaseTest {
+ private AzureBlobStorageTestAccount testAccount;
+
+ // HBase-site config controlling HBase root dir
+ private static final String HBASE_ROOT_DIR_CONF_STRING = "hbase.rootdir";
+ private static final String HBASE_ROOT_DIR_VALUE_ON_DIFFERENT_FS = "wasb://somedifferentfilesystem.blob.core.windows.net/hbase";
+ @Override
+ protected AzureBlobStorageTestAccount createTestAccount() throws Exception {
+ testAccount = AzureBlobStorageTestAccount.create();
+ return testAccount;
+ }
+
+ @Test
+ public void testAzureNativeStoreIsAtomicRenameKeyDoesNotThrowNPEOnInitializingWithNonDefaultURI () throws IOException {
+ NativeAzureFileSystem azureFs = (NativeAzureFileSystem)fs;
+ AzureNativeFileSystemStore azureStore = azureFs.getStore();
+ Configuration conf = fs.getConf();
+ conf.set(HBASE_ROOT_DIR_CONF_STRING, HBASE_ROOT_DIR_VALUE_ON_DIFFERENT_FS);
+ URI uri = fs.getUri();
+ fs.initialize(uri, conf);
+ azureStore.isAtomicRenameKey("anyrandomkey");
+ }
+}
[2/3] hadoop git commit: HADOOP-12717. NPE when trying to rename a
directory in Windows Azure Storage FileSystem. Contributed by Robert Yokota
and Gaurav Kanade.
Posted by cn...@apache.org.
HADOOP-12717. NPE when trying to rename a directory in Windows Azure Storage FileSystem. Contributed by Robert Yokota and Gaurav Kanade.
(cherry picked from commit c50aad0f854b74ede9668e35db314b0a93be81b2)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2e603874
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2e603874
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2e603874
Branch: refs/heads/branch-2
Commit: 2e60387401e1dff3fa36e32b267f2855c2e4ba49
Parents: 592f161
Author: Chris Nauroth <cn...@apache.org>
Authored: Fri Mar 4 22:57:43 2016 -0800
Committer: Chris Nauroth <cn...@apache.org>
Committed: Fri Mar 4 22:57:56 2016 -0800
----------------------------------------------------------------------
.../fs/azure/AzureNativeFileSystemStore.java | 4 +-
...ativeAzureFileSystemAtomicRenameDirList.java | 49 ++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e603874/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
index 7463bc3..cb3e9f6 100644
--- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
+++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
@@ -450,7 +450,9 @@ public class AzureNativeFileSystemStore implements NativeFileSystemStore {
// Add to this the hbase root directory, or /hbase is that is not set.
hbaseRoot = verifyAndConvertToStandardFormat(
sessionConfiguration.get("hbase.rootdir", "hbase"));
- atomicRenameDirs.add(hbaseRoot);
+ if (hbaseRoot != null) {
+ atomicRenameDirs.add(hbaseRoot);
+ }
} catch (URISyntaxException e) {
LOG.warn("Unable to initialize HBase root as an atomic rename directory.");
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e603874/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestNativeAzureFileSystemAtomicRenameDirList.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestNativeAzureFileSystemAtomicRenameDirList.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestNativeAzureFileSystemAtomicRenameDirList.java
new file mode 100644
index 0000000..b9cca25
--- /dev/null
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestNativeAzureFileSystemAtomicRenameDirList.java
@@ -0,0 +1,49 @@
+/**
+ * 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.azure;
+
+import java.io.IOException;
+import java.net.URI;
+
+import org.apache.hadoop.conf.Configuration;
+import org.junit.Test;
+
+public class TestNativeAzureFileSystemAtomicRenameDirList extends NativeAzureFileSystemBaseTest {
+ private AzureBlobStorageTestAccount testAccount;
+
+ // HBase-site config controlling HBase root dir
+ private static final String HBASE_ROOT_DIR_CONF_STRING = "hbase.rootdir";
+ private static final String HBASE_ROOT_DIR_VALUE_ON_DIFFERENT_FS = "wasb://somedifferentfilesystem.blob.core.windows.net/hbase";
+ @Override
+ protected AzureBlobStorageTestAccount createTestAccount() throws Exception {
+ testAccount = AzureBlobStorageTestAccount.create();
+ return testAccount;
+ }
+
+ @Test
+ public void testAzureNativeStoreIsAtomicRenameKeyDoesNotThrowNPEOnInitializingWithNonDefaultURI () throws IOException {
+ NativeAzureFileSystem azureFs = (NativeAzureFileSystem)fs;
+ AzureNativeFileSystemStore azureStore = azureFs.getStore();
+ Configuration conf = fs.getConf();
+ conf.set(HBASE_ROOT_DIR_CONF_STRING, HBASE_ROOT_DIR_VALUE_ON_DIFFERENT_FS);
+ URI uri = fs.getUri();
+ fs.initialize(uri, conf);
+ azureStore.isAtomicRenameKey("anyrandomkey");
+ }
+}