Prechádzať zdrojové kódy

AMBARI-4383. Datanode data directory is not created correctly (Eugene
Chekanskiy via aonishuk)

Andrew Onischuk 11 rokov pred
rodič
commit
e84f5368cc

+ 9 - 8
ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/package/scripts/hdfs_datanode.py

@@ -30,14 +30,15 @@ def datanode(action=None):
               mode=0750,
               owner=params.hdfs_user,
               group=params.user_group)
-    Directory(os.path.dirname(params.dfs_data_dir),
-              recursive=True,
-              mode=0755)
-    Directory(params.dfs_data_dir,
-              recursive=False,
-              mode=0750,
-              owner=params.hdfs_user,
-              group=params.user_group)
+    for data_dir in params.dfs_data_dir.split(","):
+      Directory(os.path.dirname(data_dir),
+                recursive=True,
+                mode=0755)
+      Directory(data_dir,
+                recursive=False,
+                mode=0750,
+                owner=params.hdfs_user,
+                group=params.user_group)
 
   if action == "start":
     service(

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/package/scripts/utils.py

@@ -81,7 +81,7 @@ def hdfs_directory(name=None, owner=None, group=None,
   dir_absent_in_stub = format(
     "grep -q '^{name}$' {stub_dir}/{stub_filename} > /dev/null 2>&1; test $? -ne 0")
   record_dir_in_stub = format("echo '{name}' >> {stub_dir}/{stub_filename}")
-  tries = 3
+  tries = 30
   try_sleep = 10
   dfs_check_nn_status_cmd = "true"
 

+ 6 - 5
ambari-server/src/main/resources/stacks/HDP/2.1.1/services/HDFS/package/scripts/hdfs_datanode.py

@@ -30,11 +30,12 @@ def datanode(action=None):
               mode=0750,
               owner=params.hdfs_user,
               group=params.user_group)
-    Directory(params.dfs_data_dir,
-              recursive=True,
-              mode=0755,
-              owner=params.hdfs_user,
-              group=params.user_group)
+    for data_dir in params.dfs_data_dir.split(","):
+      Directory(data_dir,
+                recursive=True,
+                mode=0755,
+                owner=params.hdfs_user,
+                group=params.user_group)
 
   if action == "start":
     service(

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.1.1/services/HDFS/package/scripts/utils.py

@@ -81,7 +81,7 @@ def hdfs_directory(name=None, owner=None, group=None,
   dir_absent_in_stub = format(
     "grep -q '^{name}$' {stub_dir}/{stub_filename} > /dev/null 2>&1; test $? -ne 0")
   record_dir_in_stub = format("echo '{name}' >> {stub_dir}/{stub_filename}")
-  tries = 3
+  tries = 30
   try_sleep = 10
   dfs_check_nn_status_cmd = "true"