Skip to content

Configurable max procs max atoms master #1529

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

Merged
merged 11 commits into from
Feb 26, 2018

Conversation

michaelklishin
Copy link
Collaborator

Proposed Changes

Same as #1528 by @gerhard but against master.

michaelklishin and others added 6 commits February 23, 2018 00:04
 * Handle more responses
 * Don't emit confusing suggestions that rabbit (or plugin) setting should be set in the advanced.config file
   as that won't change a thing (but it will for kernel)
…ime-in-new-config-format

Support kernel.net_ticktime in Cuttlefish configuration
This property is essential for nodes that need to handle many
connections / channels / queues.

Related to #1513
This was the only property in SERVER_ERL_ARGS that was not configurable.
Even though it's unlikely that this will need to be increased above the
existing 5 million default, we are consistent in allowing all properties
in SERVER_ERL_ARGS to be cofigured.
This property is essential for nodes that need to handle many
connections / channels / queues.

Related to #1513

(cherry picked from commit 2739b40)
This was the only property in SERVER_ERL_ARGS that was not configurable.
Even though it's unlikely that this will need to be increased above the
existing 5 million default, we are consistent in allowing all properties
in SERVER_ERL_ARGS to be cofigured.

(cherry picked from commit b1e163f)
[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_PROCESSES" ] && RABBITMQ_MAX_NUMBER_OF_PROCESSES=="${DEFAULT_MAX_NUMBER_OF_PROCESSES}"

DEFAULT_MAX_NUMBER_OF_ATOMS=5000000
[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_ATOMS" ] && RABBITMQ_MAX_NUMBER_OF_ATOMS=="${DEFAULT_MAX_NUMBER_OF_ATOMS}"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

== seems to be bash-specific and is not available in zsh.

Copy link
Collaborator

@lukebakken lukebakken Feb 23, 2018

Choose a reason for hiding this comment

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

I totally missed that, assignment vs comparison. Fixing it now and figuring out why make bats didn't catch it

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

ShellCheck catches it, too:

In scripts/rabbitmq-env line 91:
[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_PROCESSES" ] && RABBITMQ_MAX_NUMBER_OF_PROCESSES=="${DEFAULT_MAX_NUMBER_OF_PROCESSES}"
                                                                                  ^-- SC1097: Unexpected ==. For assignment, use =. For comparison, use [/[[.


In scripts/rabbitmq-env line 94:
[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_ATOMS" ] && RABBITMQ_MAX_NUMBER_OF_ATOMS=="${DEFAULT_MAX_NUMBER_OF_ATOMS}"
                                                                          ^-- SC1097: Unexpected ==. For assignment, use =. For comparison, use [/[[.

@michaelklishin
Copy link
Collaborator Author

Another thing I've noticed, which doesn't have to be addressed in this PR, is that in rabbitmq-env.conf environment variables are not supposed to have RABBITMQ_ prefixes. I don't think it works that way for all variables, trying to prove myself wrong a.t.m.

@lukebakken
Copy link
Collaborator

@michaelklishin that's correct and is also something I just noticed. Addressing it as well.

@gerhard
Copy link
Contributor

gerhard commented Feb 23, 2018

@lukebakken this comment applies here as well. Pretty sure the original env vars which started with RABBITMQ_ were correct.

@michaelklishin
Copy link
Collaborator Author

The docs suggest otherwise.

@michaelklishin
Copy link
Collaborator Author

Merging per verbal approval from @dumbbell.

@michaelklishin michaelklishin merged commit 846984d into master Feb 26, 2018
@lukebakken lukebakken deleted the configurable-max-procs-max-atoms-master branch February 26, 2018 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants