Skip to content

STORM-2380 worker.childopts with whitespace inside one param#1964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nilday wants to merge 1 commit into from
Closed

STORM-2380 worker.childopts with whitespace inside one param #1964

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
17 changes: 13 additions & 4 deletions storm-core/src/jvm/org/apache/storm/daemon/supervisor/BasicContainer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.apache.commons.lang.StringUtils;
import org.apache.storm.Config;
Expand DownExpand Up@@ -411,10 +413,17 @@ protected List<String> substituteChildopts(Object value, int memOnheap) {
if (value instanceof String) {
String string = substituteChildOptsInternal((String) value, memOnheap);
if (StringUtils.isNotBlank(string)) {
String[] strings = string.split("\\s+");
for (String s: strings) {
if (StringUtils.isNotBlank(s)) {
rets.add(s);
/* This pattern matches
* 1.everything starts with -XX:\w+ or -D[\w.]+ and followed with quoted (both ' and ") strings
* 2.everything without \s, ' and " in it
* This will solve the problem which params like -XX:OnError="pstack %p >~/pstack%p.log" will be split into pieces
*/
Matcher m= Pattern.compile("(?:-XX:\\w+|-D[\\w.]+)=((?<![\\\\])['\\\"])((?:.(?!(?<![\\\\])\\1))*.?)\\1|[^\\s\\\"']+")
.matcher(string);
while (m.find()){
String opt=m.group();
if(StringUtils.isNotBlank(opt)){
rets.add(opt);
}
}
}
Expand Down