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.

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

add 'state_output_profile' option for profile output #19320

Merged
merged 3 commits into from
Jan 2, 2015

Conversation

clan
Copy link
Contributor

@clan clan commented Jan 2, 2015

We use "pdsh -l root -g group salt-call state.sls service.xxxx test=True| dshbak -c" to check whether the change is expected and identical for many hosts before actually apply them. With the profile information is shown, the diff infomation from different hosts can't be merged (by dshbak -c) because of the start time and duration. This patch add an option 'state_output_profile', so we can turn off the started and duration info.

@@ -460,6 +460,10 @@
# states is cluttering the logs. Set it to True to ignore them.
#state_output_diff: False

# The state_output_profile setting changes whether profile information
# will be shown for each statei run.
Copy link
Contributor

Choose a reason for hiding this comment

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

statei should be state

@thatch45
Copy link
Contributor

thatch45 commented Jan 2, 2015

I am wondering if this change could help you:

pdsh -l root -g group salt-call state.sls service.xxxx test=True --out json | dshbak -c

Otherwise I am happy to merge this in given the commented lines are fixed :)

@clan
Copy link
Contributor Author

clan commented Jan 2, 2015

ok, fixed as advised in the comment.

The readability of json output is worse than text output, so I prefer this options to be included, thanks!

thatch45 added a commit that referenced this pull request Jan 2, 2015
add 'state_output_profile' option for profile output
@thatch45 thatch45 merged commit e2dd4b9 into saltstack:develop Jan 2, 2015
@thatch45
Copy link
Contributor

thatch45 commented Jan 2, 2015

Thanks @clan ! I considered that after posting it, thanks for the changes!

@clan clan deleted the opt_profile branch January 2, 2015 17:44
@clan
Copy link
Contributor Author

clan commented May 27, 2015

why this pull request not merged to 2015.5 branch? thanks

@rallytime
Copy link
Contributor

Hi @clan - So our workflow is to merge branches "forward". So, for example, a release branch such as 2014.7 or 2015.5 is merged forward into newer branches like develop. (2014.7 --> 2015.5, and then 2015.5 --> develop.) If a fix belongs in a release branch, rather than develop, then the fix should be applied directly to that branch, and then it will merge forward and propagate to all "newer" branches.

If a fix was originally made against a "newer" branch such as develop, but it should be in an older branch like 2015.5, then we'll need to backport it. We try to determine if fixes should be backported when they're submitted, but sometimes we miss some. I can look at backporting this fix right now.

In the future, best practice is to make the fix against the release branch that the bug occurs on and then we'll merge it forward. You can read more about that here, if you like.

@rallytime rallytime added the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label May 27, 2015
@rallytime rallytime added ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. and removed bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels May 27, 2015
jfindlay added a commit that referenced this pull request May 28, 2015
@clan
Copy link
Contributor Author

clan commented May 29, 2015

got it, thanks!

@rallytime
Copy link
Contributor

Sure thing! :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants