Skip to content
This repository was archived by the owner on Dec 15, 2025. It is now read-only.

Fix auto probe java opts' bug #321

Merged
carsonwang merged 1 commit into from
Oct 10, 2016
+7 −4
Merged

Fix auto probe java opts' bug #321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions bin/functions/load-config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,14 +597,17 @@ def probe_java_opts():
if "mapreduce.reduce.java.opts" in line and cnt + 1 < len(content):
reduce_java_opts_line = content[cnt + 1]
cnt += 1
def add_quotation_marks(line):
if not (line.startswith("'") or line.startswith("\"")):
return "'" + line + "'"
if map_java_opts_line != "":
HibenchConf['hibench.dfsioe.map.java_opts'] = map_java_opts_line.split("<")[
0].strip()
HibenchConf['hibench.dfsioe.map.java_opts'] = add_quotation_marks(map_java_opts_line.split("<")[
0].strip())
HibenchConfRef['hibench.dfsioe.map.java_opts'] = "Probed by configuration file:'%s'" % os.path.join(
HibenchConf['hibench.hadoop.configure.dir'], 'mapred-site.xml')
if reduce_java_opts_line != "":
HibenchConf['hibench.dfsioe.red.java_opts'] = reduce_java_opts_line.split("<")[
0].strip()
HibenchConf['hibench.dfsioe.red.java_opts'] = add_quotation_marks(reduce_java_opts_line.split("<")[
0].strip())
HibenchConfRef['hibench.dfsioe.red.java_opts'] = "Probed by configuration file:'%s'" % os.path.join(
HibenchConf['hibench.hadoop.configure.dir'], 'mapred-site.xml')

Expand Down