-
Notifications
You must be signed in to change notification settings - Fork 19
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
CLOUD-464: Updates for Reconciliation #176
base: master
Are you sure you want to change the base?
Conversation
The following changes have been made:
For MySQL Server we change the my-ndb.cnf file to use a mysqld.pid |
|
|
attributes/default.rb
Outdated
default['ndb']['majorVersion'] = "21" | ||
default['ndb']['minorVersion'] = "04" | ||
default['ndb']['patchVersion'] = "15" | ||
default['ndb']['majorVersion'] = "22" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
version change should wait for RONDB-519, which updates rondb from the entire platform
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok
templates/default/ndbd-start.sh.erb
Outdated
if [ "${NDBD_INITIAL_RESTART}" = "true" ]; then | ||
INIT_ARG=--initial | ||
sed -i 's/^NDBD_INITIAL_RESTART=.*$/NDBD_INITIAL_RESTART=false/g' <%= node['ndb']['scripts_dir'] %>/ndbd_env_variables | ||
elif [ -n "${INITIAL_START}" ] ; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can combine this in the same if
condition and avoid duplicating code ;)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, I think the only place where we use NDBD_INITIAL_RESTART
is ec2-init
and ndb-agent
so I think shortly after everything is merged we can continue with only one variable
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, made an attempt, but a bit uncertain about the exact syntax to use
Co-authored-by: Antonis Kouzoupis <[email protected]>
recipes/mgmd.rb
Outdated
@@ -101,7 +101,7 @@ | |||
group "root" | |||
mode 0754 | |||
cookbook 'ndb' | |||
variables({ :node_id => found_id }) | |||
variables({}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can remove this line entirely ;)
templates/default/ndbd-start.sh.erb
Outdated
@@ -8,11 +8,17 @@ if [ "X$USERID" != "X<%= node['ndb']['user'] %>" ]; then | |||
exit -3 | |||
fi | |||
|
|||
if [ "${NDBD_INITIAL_RESTART}" = "true" ]; then | |||
INIT_ARG= | |||
if [ "${NDBD_INITIAL_RESTART}" = "true" || -n "${INITIAL_START}" ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The correct syntax is either [[ "${NDBD_INITIAL_RESTART}" = "true" || -n "${INITIAL_START}" ]]
note the double square brackets or [ "${NDBD_INITIAL_RESTART}" = "true" ] || [ -n "${INITIAL_START}" ]
Co-authored-by: Mahmoud Ismail <[email protected]>
The ndb-agent expects the following files to exist under mgmd_env_variables
mysqld_env_variables
ndbd_env_variables
|
The reason for the service name is to avoid having to sed pid files everywhere. It makes the ndb-agent difficult to reliably test locally since we use supervisord instead of systemd. supervisord runs processes in foreground, so there's no .pid file. |
No description provided.