Skip to content
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

Jump to bottom

STORM-3506 prevent topo conf from overriding some system properties #3125

Merged
merged 3 commits into from
Sep 26, 2019
Merged

STORM-3506 prevent topo conf from overriding some system properties #3125

merged 3 commits into from
Sep 26, 2019

Conversation

agresch
Copy link
Contributor

@agresch agresch commented Sep 5, 2019

No description provided.

kishorvpatil
kishorvpatil approved these changes Sep 9, 2019
View reviewed changes
Copy link
Contributor

@kishorvpatil kishorvpatil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@Ethanlm
Copy link
Contributor

Ethanlm commented Sep 17, 2019

Actually after reviewing this again, I think this might not work as expected. The code below this is
Map<String, Object> totalConfToSave = Utils.merge(otherConf, topoConf); and the totalConfToSave is actually the one that got used for topology. If this STORM_CGROUP_HIERARCHY_DIR config exists in otherConf but not in topoConf, it will eventually stay in totalConfToSave

@agresch
Copy link
Contributor Author

agresch commented Sep 18, 2019

@Ethanlm - will look into your comment when I get a chance.

@agresch
Copy link
Contributor Author

agresch commented Sep 20, 2019

@Ethanlm - I think you are right. This change would fix if it's set by the topology, but not if a differing setting is on the client's storm.yaml. Thanks for pointing this out.

@agresch
Copy link
Contributor Author

agresch commented Sep 25, 2019

@Ethanlm - could you take a look again when you get a chance?

Ethanlm
Ethanlm approved these changes Sep 26, 2019
View reviewed changes
Copy link
Contributor

@Ethanlm Ethanlm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 Thanks

@Ethanlm Ethanlm merged commit a2a2028 into apache:master Sep 26, 2019
asfgit pushed a commit that referenced this pull request Sep 26, 2019
@agresch @Ethanlm
STORM-3506 prevent topo conf from overriding some system properties (#…
5de9e09 
…3125)
@Ethanlm
Copy link
Contributor

Ethanlm commented Sep 26, 2019 •
edited
Loading

also applied to 2.1.x-branch

Ethanlm pushed a commit to Ethanlm/storm that referenced this pull request Oct 25, 2019
@agresch @Ethanlm
STORM-3506 prevent topo conf from overriding some system properties (a…
1d76b9b 
…pache#3125)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kishorvpatil kishorvpatil kishorvpatil approved these changes

@Ethanlm Ethanlm Ethanlm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@agresch @Ethanlm @kishorvpatil