Issue when environment isn't HDFS HA..

dstreev · May 3, 2021 · add0326 · add0326
1 parent a6fdfd4
commit add0326
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.streever.hadoop</groupId>
     <artifactId>hadoop-cli</artifactId>
-    <version>2.3.0.2-SNAPSHOT</version>
+    <version>2.3.1.0-SNAPSHOT</version>
     <name>Hadoop CLI</name>
     <description>Hadoop Command Line Interface</description>
     <properties>

diff --git a/src/main/java/com/streever/hadoop/hdfs/util/FileSystemOrganizer.java b/src/main/java/com/streever/hadoop/hdfs/util/FileSystemOrganizer.java
@@ -89,26 +89,38 @@ protected void init() {
             localFileSystem = FileSystem.getLocal(config);
             String defaultFS = config.get("fs.defaultFS");
             String configuredNameservices = config.get("dfs.nameservices");
-            String[] nameservices = configuredNameservices.split(",");
-            for (String nameservice : nameservices) {
-                if (defaultFS.contains(nameservice)) {
-                    // Setup Default State
-                    FileSystemState fss = new FileSystemState();
-                    fss.setFileSystem(distributedFileSystem);
-                    fss.setNamespace(nameservice);
-                    fss.setProtocol("hdfs://");
-                    fss.setWorkingDirectory(new Path("/"));
-                    namespaces.put(nameservice, fss);
-                    defaultFileSystemState = fss;
-                    currentFileSystemState = fss;
-                } else {
-                    FileSystemState fss = new FileSystemState();
-                    fss.setFileSystem(distributedFileSystem);
-                    fss.setNamespace(nameservice);
-                    fss.setProtocol("hdfs://");
-                    fss.setWorkingDirectory(new Path("/"));
-                    namespaces.put(nameservice, fss);
+            if (configuredNameservices != null) {
+                String[] nameservices = configuredNameservices.split(",");
+                for (String nameservice : nameservices) {
+                    if (defaultFS.contains(nameservice)) {
+                        // Setup Default State
+                        FileSystemState fss = new FileSystemState();
+                        fss.setFileSystem(distributedFileSystem);
+                        fss.setNamespace(nameservice);
+                        fss.setProtocol("hdfs://");
+                        fss.setWorkingDirectory(new Path("/"));
+                        namespaces.put(nameservice, fss);
+                        defaultFileSystemState = fss;
+                        currentFileSystemState = fss;
+                    } else {
+                        FileSystemState fss = new FileSystemState();
+                        fss.setFileSystem(distributedFileSystem);
+                        fss.setNamespace(nameservice);
+                        fss.setProtocol("hdfs://");
+                        fss.setWorkingDirectory(new Path("/"));
+                        namespaces.put(nameservice, fss);
+                    }
                 }
+            } else {
+                // Setup Default State
+                FileSystemState fss = new FileSystemState();
+                fss.setFileSystem(distributedFileSystem);
+                fss.setNamespace(defaultFS.replace("hdfs://",""));
+                fss.setProtocol("hdfs://");
+                fss.setWorkingDirectory(new Path("/"));
+                namespaces.put(defaultFS, fss);
+                defaultFileSystemState = fss;
+                currentFileSystemState = fss;
             }
             // Build the Local FileSystemState
             FileSystemState lfss = new FileSystemState();