GOMAXPROCS picks number of CPUs using sysconfig - Also updated Serverspec to 2.0 #52

goncalopereira · 2014-10-15T13:02:11Z

Current server spec installation will use 2.0 - which means i have to
change spec_helper and matchers.

Also consul uses the ui with an extra relative folder consul_ui - that
had to be fixed for server spec to pass

Current server spec installation will use 2.0 - which means i have to change spec_helper and matchers. Also consul uses the ui with an extra relative folder consul_ui - that had to be fixed for server spec to pass

coveralls · 2014-10-15T13:12:02Z

Coverage remained the same when pulling 122e6e5 on goncalopereira:master into 4afbc3e on johnbellone:master.

Updated init.d script to use GOMAXPROCS on sysconfig - This can be changed on the attributes - best practice is to use same number as CPUs available

GOMAXPROCS picks up number of CPUs instead of leaving it as an attribute

coveralls · 2014-10-15T14:48:31Z

Coverage remained the same when pulling 6204a44 on goncalopereira:master into 4afbc3e on johnbellone:master.

sysconfig needs to trigger init instead of the service - calling immediately twice creates issues with the service already being restarted

coveralls · 2014-10-15T15:44:32Z

Coverage remained the same when pulling b8da19a on goncalopereira:master into 4afbc3e on johnbellone:master.

templates/default/consul-sysconfig.erb

@@ -0,0 +1 @@
+export GOMAXPROCS=<%= @gomaxprocs %>


environment export should sit within init script not sysconfig

goncalopereira · 2014-10-16T12:13:41Z

Fixed the two issues as requested, Thanks @johnbellone

coveralls · 2014-10-16T12:19:53Z

Coverage remained the same when pulling 0563c53 on goncalopereira:master into 4afbc3e on johnbellone:master.

recipes/_service.rb

+    source 'consul-sysconfig.erb'
+    mode 0755
+    variables(
+      gomaxprocs: node['cpu']['total']


johnbellone · 2014-10-17T02:03:27Z

Also you'll need to rebase. Thanks for the work 🍺!

Current server spec installation will use 2.0 - which means i have to change spec_helper and matchers. Also consul uses the ui with an extra relative folder consul_ui - that had to be fixed for server spec to pass cleaning up .gitignore clean up gitignore

Updated init.d script to use GOMAXPROCS on sysconfig - This can be changed on the attributes - best practice is to use same number as CPUs available Best Practice - Force Chef to setup number of CPUs GOMAXPROCS picks up number of CPUs instead of leaving it as an attribute Sysconfig triggers init.d template not the service sysconfig needs to trigger init instead of the service - calling immediately twice creates issues with the service already being restarted remove unused .gitignore2 file Init environment setup environment export should sit within init script not sysconfig moving cpu total variable into template instead of variables

goncalopereira · 2014-10-17T10:02:46Z

Hi there, fixed the template as suggested.
Also squashed onto two single commits - one for serverspec one for GOMAXPROCS

Conflicts: test/integration/default/serverspec/spec_helper.rb test/integration/ui/serverspec/spec_helper.rb

coveralls · 2014-10-17T12:19:00Z

Coverage remained the same when pulling daf164f on goncalopereira:master into d75fe45 on johnbellone:master.

johnbellone · 2014-10-17T13:03:42Z

Great work!

goncalopereira · 2014-10-17T13:06:33Z

@johnbellone I'm having some issues rebasing the upstream merge commits ... could you help me with that?

johnbellone · 2014-10-17T13:09:20Z

What are the issues that you're having?

goncalopereira · 2014-10-17T13:14:28Z

[detached HEAD 3396d3d] GOMAXPROCS used through sysconfig
16 files changed, 81 insertions(+), 36 deletions(-)
create mode 100644 .foodcritic
delete mode 100644 .gitignore2
create mode 100644 spec_helper.rb
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

git commit --allow-empty

Otherwise, please use 'git reset'
rebase in progress; onto b8da19a
You are currently rebasing branch 'master' on 'b8da19a'.

nothing to commit, working directory clean
Could not apply c1543cb... Squash dubious
foodcritic warnings for FC001.

On 17 October 2014 14:09, John Bellone notifications@github.com wrote:

What are the issues that you're having?

—
Reply to this email directly or view it on GitHub
#52 (comment)
.

templates/default/consul-init.erb

+. /etc/sysconfig/consul
+fi
+
+export GOMAXPROCS=${GOMAXPROCS:-2}


goncalopereira · 2014-10-23T20:16:39Z

the rebase is giving us headaches - I can re-fork head and re-apply as one commit - what do you think? I'll send another pull request if you agree.

johnbellone · 2014-10-24T01:52:55Z

I don't think the rebase is giving headaches - at least not to me - I am able to merge it. Could you just take care of the default value (per above comment)?

goncalopereira · 2014-10-24T11:01:16Z

Done. Thanks

coveralls · 2014-10-24T11:06:40Z

Coverage remained the same when pulling 6adbdcf on goncalopereira:master into 553d25f on johnbellone:master.

GOMAXPROCS picks number of CPUs using sysconfig - Also updated Serverspec to 2.0

lock · 2020-04-25T09:57:35Z

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

serverspec2.0 added and consul_ui test fixed

122e6e5

Current server spec installation will use 2.0 - which means i have to change spec_helper and matchers. Also consul uses the ui with an extra relative folder consul_ui - that had to be fixed for server spec to pass

goncalopereira added 4 commits October 15, 2014 15:03

cleaning up .gitignore

ed1b0d9

clean up gitignore

014ee8f

GOMAXPROCS used through sysconfig

d451e81

Updated init.d script to use GOMAXPROCS on sysconfig - This can be changed on the attributes - best practice is to use same number as CPUs available

Best Practice - Force Chef to setup number of CPUs

6204a44

GOMAXPROCS picks up number of CPUs instead of leaving it as an attribute

goncalopereira changed the title ~~serverspec2.0 added and consul_ui test fixed~~ GOMAXPROCS picks number of CPUs using sysconfig - Also updated Serverspec to 2.0 Oct 15, 2014

Sysconfig triggers init.d template not the service

b8da19a

sysconfig needs to trigger init instead of the service - calling immediately twice creates issues with the service already being restarted

johnbellone reviewed Oct 15, 2014
View reviewed changes

templates/default/consul-sysconfig.erb

@@ -0,0 +1 @@

export GOMAXPROCS=<%= @gomaxprocs %>

This comment was marked as outdated.

Sign in to view

This comment was marked as outdated.

Sign in to view

goncalopereira added 2 commits October 16, 2014 10:53

remove unused .gitignore2 file

0310f61

Init environment setup

0563c53

environment export should sit within init script not sysconfig

reset reviewed Oct 16, 2014
View reviewed changes

goncalopereira added 3 commits October 17, 2014 10:57

moving cpu total variable into template instead of variables

9b9f536

goncalopereira added 4 commits October 17, 2014 12:57

merging upstream

44f7e36

Merge remote-tracking branch 'upstream/master'

05db45f

Conflicts: test/integration/default/serverspec/spec_helper.rb test/integration/ui/serverspec/spec_helper.rb

fix merge

68e4382

merge fix again

daf164f

johnbellone added the enhancement label Oct 22, 2014

johnbellone added this to the 0.5.0 milestone Oct 22, 2014

johnbellone reviewed Oct 22, 2014
View reviewed changes

templates/default/consul-init.erb

. /etc/sysconfig/consul

fi

export GOMAXPROCS=${GOMAXPROCS:-2}

This comment was marked as outdated.

Sign in to view

This comment was marked as outdated.

Sign in to view

This comment was marked as outdated.

Sign in to view

goncalo added 2 commits October 24, 2014 11:57

allow GOMAXPROCS to always use CPU Information, no default

3c9b497

Merge remote-tracking branch 'upstream/master'

6adbdcf

johnbellone added a commit that referenced this pull request Oct 25, 2014

Merge pull request #52 from goncalopereira/master

31e7357

GOMAXPROCS picks number of CPUs using sysconfig - Also updated Serverspec to 2.0

johnbellone merged commit 31e7357 into sous-chefs:master Oct 25, 2014

lock bot locked as resolved and limited conversation to collaborators Apr 25, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GOMAXPROCS picks number of CPUs using sysconfig - Also updated Serverspec to 2.0 #52

GOMAXPROCS picks number of CPUs using sysconfig - Also updated Serverspec to 2.0 #52

goncalopereira commented Oct 15, 2014

coveralls commented Oct 15, 2014

coveralls commented Oct 15, 2014

coveralls commented Oct 15, 2014

This comment was marked as outdated.

This comment was marked as outdated.

goncalopereira commented Oct 16, 2014

coveralls commented Oct 16, 2014

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

johnbellone commented Oct 17, 2014

goncalopereira commented Oct 17, 2014

coveralls commented Oct 17, 2014

johnbellone commented Oct 17, 2014

goncalopereira commented Oct 17, 2014

johnbellone commented Oct 17, 2014

goncalopereira commented Oct 17, 2014

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

goncalopereira commented Oct 23, 2014

johnbellone commented Oct 24, 2014

goncalopereira commented Oct 24, 2014

coveralls commented Oct 24, 2014

lock bot commented Apr 25, 2020

GOMAXPROCS picks number of CPUs using sysconfig - Also updated Serverspec to 2.0 #52

GOMAXPROCS picks number of CPUs using sysconfig - Also updated Serverspec to 2.0 #52

Conversation

goncalopereira commented Oct 15, 2014

coveralls commented Oct 15, 2014

coveralls commented Oct 15, 2014

coveralls commented Oct 15, 2014

This comment was marked as outdated.

This comment was marked as outdated.

goncalopereira commented Oct 16, 2014

coveralls commented Oct 16, 2014

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

johnbellone commented Oct 17, 2014

goncalopereira commented Oct 17, 2014

coveralls commented Oct 17, 2014

johnbellone commented Oct 17, 2014

goncalopereira commented Oct 17, 2014

johnbellone commented Oct 17, 2014

goncalopereira commented Oct 17, 2014

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

goncalopereira commented Oct 23, 2014

johnbellone commented Oct 24, 2014

goncalopereira commented Oct 24, 2014

coveralls commented Oct 24, 2014

lock bot commented Apr 25, 2020