updated python scripts to account for config dir and log file command line settings

src/bin/metadata_start.py

@@ -20,8 +20,9 @@ import sys
 
 import metadata_config as mc
 
-METADATA_LOG_OPTS="-Dmetadata.log.dir=%s"
+METADATA_LOG_OPTS="-Dmetadata.log.dir=%s -Dmetadata.log.file=application.log"
 METADATA_COMMAND_OPTS="-Dmetadata.home=%s"
+METADATA_CONFIG_OPTS="-Dmetadata.conf=%s"
 DEFAULT_JVM_OPTS="-Xmx1024m"
 
 def main():
@@ -37,6 +38,9 @@ def main():
     cmd_opts = (METADATA_COMMAND_OPTS % metadata_home)
     jvm_opts_list.extend(cmd_opts.split())
 
+    config_opts = (METADATA_CONFIG_OPTS % confdir)
+    jvm_opts_list.extend(config_opts.split())
+
     default_jvm_opts = DEFAULT_JVM_OPTS
     metadata_jvm_opts = os.environ.get(mc.METADATA_OPTS, default_jvm_opts)
     jvm_opts_list.extend(metadata_jvm_opts.split())

src/test/python/scripts/TestMetadata.py

@@ -50,13 +50,13 @@ class TestMetadata(unittest.TestCase):
         'org.apache.hadoop.metadata.Main',
         ['-app', 'metadata_home/server/webapp/metadata'],
         'metadata_home/conf:metadata_home/server/webapp/metadata/WEB-INF/classes:metadata_home/server/webapp/metadata/WEB-INF/lib\\*:metadata_home/libext\\*',
-        ['-Dmetadata.log.dir=metadata_home/logs', '-Dmetadata.home=metadata_home', '-Xmx1024m'])
+        ['-Dmetadata.log.dir=metadata_home/logs', '-Dmetadata.home=metadata_home', '-Dmetadata.conf=metadata_home/conf', '-Xmx1024m'])
     else:
       java_mock.assert_called_with(
         'org.apache.hadoop.metadata.Main',
         ['-app', 'metadata_home/server/webapp/metadata'],
         'metadata_home/conf:metadata_home/server/webapp/metadata/WEB-INF/classes:metadata_home/server/webapp/metadata/WEB-INF/lib/*:metadata_home/libext/*',
-        ['-Dmetadata.log.dir=metadata_home/logs', '-Dmetadata.home=metadata_home', '-Xmx1024m'])
+        ['-Dmetadata.log.dir=metadata_home/logs', '-Dmetadata.home=metadata_home', '-Dmetadata.conf=metadata_home/conf', '-Xmx1024m'])
     pass