浏览代码

AMBARI-14497. NFS Gateway fails to start with /tmp/.hdfs-nfs warning in logs (aonishuk)

Andrew Onishuk 9 年之前
父节点
当前提交
bc841dce63

+ 4 - 1
ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_nfsgateway.py

@@ -61,7 +61,10 @@ def nfsgateway(action=None, format=False):
     prepare_rpcbind()
 
   if action == "configure":
-    return
+    Directory(params.nfs_file_dump_dir,
+              owner = params.hdfs_user,
+              group = params.user_group,
+    )
   elif action == "start" or action == "stop":
     service(
       action=action,

+ 1 - 0
ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py

@@ -201,6 +201,7 @@ proxyuser_group =  config['configurations']['hadoop-env']['proxyuser_group']
 #hadoop params
 hdfs_log_dir_prefix = config['configurations']['hadoop-env']['hdfs_log_dir_prefix']
 hadoop_root_logger = config['configurations']['hadoop-env']['hadoop_root_logger']
+nfs_file_dump_dir = config['configurations']['hdfs-site']['nfs.file.dump.dir']
 
 dfs_domain_socket_path = config['configurations']['hdfs-site']['dfs.domain.socket.path']
 dfs_domain_socket_dir = os.path.dirname(dfs_domain_socket_path)

+ 8 - 0
ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py

@@ -209,6 +209,10 @@ class TestNFSGateway(RMFTestCase):
                               content = Template('slaves.j2'),
                               owner = 'hdfs',
                               )
+    self.assertResourceCalled('Directory', '/tmp/.hdfs-nfs',
+        owner = 'hdfs',
+        group = 'hadoop',
+    )
 
 
   def assert_configure_secured(self):
@@ -254,6 +258,10 @@ class TestNFSGateway(RMFTestCase):
                               content = Template('slaves.j2'),
                               owner = 'root',
                               )
+    self.assertResourceCalled('Directory', '/tmp/.hdfs-nfs',
+        owner = 'hdfs',
+        group = 'hadoop',
+    )
 
 
 

+ 1 - 0
ambari-server/src/test/python/stacks/2.0.6/configs/default.json

@@ -242,6 +242,7 @@
             "dfs.namenode.avoid.write.stale.datanode": "true", 
             "dfs.block.access.token.enable": "true", 
             "dfs.support.append": "true", 
+            "nfs.file.dump.dir": "/tmp/.hdfs-nfs",
             "dfs.datanode.address": "0.0.0.0:${ambari.dfs.datanode.port}", 
             "dfs.cluster.administrators": "test_user1,test_user2 hdfs,test_group",
             "dfs.replication": "3", 

+ 1 - 0
ambari-server/src/test/python/stacks/2.0.6/configs/secured.json

@@ -294,6 +294,7 @@
             "dfs.client.read.shortcircuit": "true", 
             "dfs.journalnode.keytab.file": "/etc/security/keytabs/jn.service.keytab", 
             "dfs.datanode.http.address": "0.0.0.0:1022",
+            "nfs.file.dump.dir": "/tmp/.hdfs-nfs",
             "dfs.datanode.du.reserved": "1073741824", 
             "dfs.client.read.shortcircuit.streams.cache.size": "4096", 
             "dfs.secondary.namenode.keytab.file": "/etc/security/keytabs/nn.service.keytab",