[HOPSWORKS-2421] Template NumCPUs when configuration type is set to a…

…utomatic (logicalclocks#66)

attributes/default.rb

@@ -109,6 +109,8 @@
 # Read up on this option first. Benefits from setting to "true" node['ndb']['interrupts_isolated_to_single_cpu']
 default['ndb']['ThreadConfig']                        = ""
 default['ndb']['SpinMethod']                          = "LatencyOptimisedSpinning"
+default['ndb']['default']['NumCPUs']                  = "-1"
+default['ndb']['NumCPUs']                             = "#{node['ndb']['default']['NumCPUs']}"
 
 
 default['ndb']['interrupts_isolated_to_single_cpu']   = "false"

metadata.rb

@@ -320,6 +320,10 @@
           :description => "SpinMethod",
           :type => 'string'
 
+attribute "ndb/NumCPUs",
+          :description => "If configuration type is set to auto controls how many CPUs will be available to ndbmtd. Default: -1 (use all CPUs)",
+          :type => 'string'
+
 attribute "ndb/TotalMemoryConfig",
           :description => "This configuration defines the amount of memory used by ndbmtd when AutomaticMemoryConfig is turned on. Minimum is 3G",
           :type => 'string'

recipes/mgmd.rb

@@ -124,6 +124,7 @@
   if node['ndb']['configuration']['profile'].casecmp?("tiny")
     node.override['ndb']['TotalMemoryConfig'] = "3G"
     node.override['ndb']['LockPagesInMainMemory'] = "0"
+    node.override['ndb']['NumCPUs'] = "4"
   end
 end
 

templates/default/config.ini.erb

@@ -12,7 +12,6 @@ TotalMemoryConfig=<%= node['ndb']['TotalMemoryConfig'] %>
   <% end -%>
 
   <% if node['ndb']['configuration']['profile'].casecmp?("tiny") -%>
-NumCPUs=4
 MaxNoOfTables=2000
 MaxNoOfOrderedIndexes=1000
 MaxNoOfUniqueHashIndexes=1000
@@ -22,6 +21,10 @@ TransactionMemory=200M
 SharedGlobalMemory=400M
   <% end -%>
 
+  <% if !node['ndb']['NumCPUs'].casecmp?(node['ndb']['default']['NumCPUs']) -%>
+NumCPUs=<%= node['ndb']['NumCPUs'] %>
+  <% end -%>
+
 ClassicFragmentation=false
 EnableRedoControl=true