Merge "remove max_memory parameter in vblob" into services-r10

hsume2 · Mar 27, 2012 · c5d3a2d · c5d3a2d
2 parents d2af5cf + d3fb525
commit c5d3a2d
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 6 deletions.
diff --git a/vblob/bin/vblob_node b/vblob/bin/vblob_node
@@ -27,7 +27,6 @@ class VCAP::Services::VBlob::NodeBin < VCAP::Services::Base::NodeBin
     options[:vblobd_log_dir] = parse_property(config, "vblobd_log_dir", String)
     options[:vblobd_path] = parse_property(config, "vblobd_path", String)
     options[:vblobd_auth] = parse_property(config, "vblobd_auth", String)
-    options[:max_memory] = parse_property(config, "max_memory", Integer)
     options
   end
 

diff --git a/vblob/config/vblob_node.yml b/vblob/config/vblob_node.yml
@@ -10,7 +10,6 @@ logging:
   level: debug
 vblobd_log_dir: /var/vcap/sys/service-log/vblob
 pid: /var/vcap/sys/run/vblob_node.pid
-max_memory: 128
 node_id: vblob_node_free_1
 nodejs_path: node
 vblobd_path: /var/vcap/packages/vblob

diff --git a/vblob/lib/vblob_service/vblob_node.rb b/vblob/lib/vblob_service/vblob_node.rb
@@ -88,7 +88,6 @@ def initialize(options)
     @vblobd_log_dir = options[:vblobd_log_dir]
     @vblobd_auth = options[:vblobd_auth] || "basic" #default is basic auth
 
-    @max_memory = options[:max_memory]
 
     @config_template = ERB.new(File.read(options[:config_template]))
 
@@ -210,7 +209,6 @@ def provision(plan, credential = nil)
     provisioned_service             = ProvisionedService.new
     provisioned_service.name        = name
     provisioned_service.port        = port
-    provisioned_service.memory      = @max_memory
     provisioned_service.keyid       = username
     provisioned_service.secretid    = password
     provisioned_service.pid         = start_instance(provisioned_service)
@@ -366,7 +364,6 @@ def get_healthz(instance)
 
   def start_instance(provisioned_service)
     @logger.debug("Starting instance: #{provisioned_service.pretty_inspect}")
-    memory = @max_memory
     pid = fork
     if pid
       @logger.debug("Service #{provisioned_service.name} started with pid #{pid}")

diff --git a/vblob/spec/spec_helper.rb b/vblob/spec/spec_helper.rb
@@ -86,7 +86,6 @@ def get_node_config()
     :mbus => parse_property(config, "mbus", String),
     :config_template => vblob_conf_template,
     :port_range => parse_property(config, "port_range", Range),
-    :max_memory => parse_property(config, "max_memory", Integer),
     :base_dir => '/tmp/vblob/instances',
     :local_db => 'sqlite3:/tmp/vblob/vblob_node.db'
   }