vcap_common 2.0.8 → 2.0.11

data/lib/services/api.rb

@@ -3,5 +3,4 @@ require 'services/api/async_requests'
 require 'services/api/const'
 require 'services/api/messages'
 require 'services/api/clients/service_gateway_client'
-require 'services/api/clients/sds_client'
 require 'services/api/util'

data/lib/services/api/const.rb

@@ -2,7 +2,6 @@
 module VCAP
   module Services
     module Api
-      SDS_UPLOAD_TOKEN_HEADER = 'X-VCAP-SDS-Upload-Token'
       GATEWAY_TOKEN_HEADER = 'X-VCAP-Service-Token'
       SERVICE_LABEL_REGEX  = /^\S+-\S+$/
     end

data/lib/services/api/messages.rb

@@ -26,7 +26,19 @@ module VCAP
         optional :description,  String
         optional :info_url,     URI::regexp(%w(http https))
         optional :tags,         [String]
+        optional :plan_details do
+          [
+            {
+              "name" => String,
+              "free" => bool,
+              optional("description") => String,
+              optional("extra") => String,
+              optional("unique_id") => String,
+            }
+          ]
+        end
         optional :plans,        [String]
+        optional :plan_descriptions
         optional :cf_plan_id
         optional :plan_options
         optional :binding_options
@@ -35,6 +47,8 @@ module VCAP
         optional :timeout,      Integer
         optional :provider,     String
         optional :default_plan, String
+        optional :extra,        String
+        optional :unique_id,    String
       end
 
       class ProxiedServiceOfferingRequest < JsonMessage
@@ -49,6 +63,12 @@ module VCAP
         required :credentials
       end
 
+      class HandleUpdateRequestV2 < JsonMessage
+        required :token, String
+        required :gateway_data
+        required :credentials
+      end
+
       class ListHandlesResponse < JsonMessage
         required :handles, [Object]
       end
@@ -72,12 +92,16 @@ module VCAP
       end
 
       class GatewayProvisionRequest < JsonMessage
-        required :label, SERVICE_LABEL_REGEX
-        required :name,  String
-        required :plan,  String
-        required :email, String
-        required :version, String
-
+        required :unique_id, String
+        required :name,      String
+        required :email,     String
+
+        optional :provider,          String
+        optional :label,             String
+        optional :plan,              String
+        optional :version,           String
+        optional :organization_guid, String
+        optional :space_guid,        String
         optional :plan_option
       end
 
@@ -86,6 +110,7 @@ module VCAP
         required :service_id, String
         required :configuration
         required :credentials
+        optional :dashboard_url, String
       end
 
       #
@@ -137,6 +162,24 @@ module VCAP
         required :snapshots,  [Object]
       end
 
+      class CreateSnapshotV2Request < JsonMessage
+        required :name, /./
+      end
+
+      class SnapshotV2 < JsonMessage
+        required :snapshot_id, String
+        required :name,  String
+        required :state, String
+        required :size,  Integer
+
+        optional :created_time,  String
+        optional :restored_time, String
+      end
+
+      class SnapshotListV2 < JsonMessage
+        required :snapshots, [Object]
+      end
+
       class UpdateSnapshotNameRequest < JsonMessage
         required :name, String
       end

data/lib/vcap/component.rb

@@ -1,10 +1,12 @@
 # Copyright (c) 2009-2011 VMware, Inc.
+require "base64"
 require "eventmachine"
-require 'thin'
-require "yajl"
+require "monitor"
 require "nats/client"
-require "base64"
-require 'set'
+require "set"
+require "thin"
+require "yajl"
+require "vmstat"
 
 module VCAP
 
@@ -48,34 +50,85 @@ module VCAP
     CONFIG_SUPPRESS = Set.new([:mbus, :service_mbus, :keys, :database_environment, :password, :pass, :token])
 
     class << self
+      class SafeHash < BasicObject
+        def initialize(hash = {})
+          @hash = hash
+        end
+
+        def threadsafe!
+          @monitor = ::Monitor.new
+        end
+
+        def synchronize
+          if @monitor
+            @monitor.synchronize do
+              begin
+                @thread = ::Thread.current
+                yield
+              ensure
+                @thread = nil
+              end
+            end
+          else
+            yield
+          end
+        end
+
+        def method_missing(sym, *args, &blk)
+          if @monitor && @thread != ::Thread.current
+            ::Kernel.raise "Lock required"
+          end
+
+          @hash.__send__(sym, *args, &blk)
+        end
+      end
+
+      def varz
+        @varz ||= SafeHash.new
+      end
 
-      attr_reader   :varz
       attr_accessor :healthz
 
       def updated_varz
         @last_varz_update ||= 0
-        if Time.now.to_f - @last_varz_update >= 1
-          # Snapshot uptime
-          @varz[:uptime] = VCAP.uptime_string(Time.now - @varz[:start])
 
-          # Grab current cpu and memory usage.
+        if Time.now.to_f - @last_varz_update >= 1
+          # Grab current cpu and memory usage
           rss, pcpu = `ps -o rss=,pcpu= -p #{Process.pid}`.split
-          @varz[:mem] = rss.to_i
-          @varz[:cpu] = pcpu.to_f
 
-          @last_varz_update = Time.now.to_f
+          # Update varz
+          varz.synchronize do
+            @last_varz_update = Time.now.to_f
+
+            varz[:uptime] = VCAP.uptime_string(Time.now - varz[:start])
+            varz[:mem] = rss.to_i
+            varz[:cpu] = pcpu.to_f
+
+            memory = Vmstat.memory
+            varz[:mem_used_bytes] = memory.active_bytes + memory.wired_bytes
+            varz[:mem_free_bytes] = memory.inactive_bytes + memory.free_bytes
+
+            varz[:cpu_load_avg] = Vmstat.load_average.one_minute
+
+            # Return duplicate while holding lock
+            return varz.dup
+          end
+        else
+          # Return duplicate while holding lock
+          varz.synchronize do
+            return varz.dup
+          end
         end
-        varz
       end
 
       def updated_healthz
         @last_healthz_update ||= 0
+
         if Time.now.to_f - @last_healthz_update >= 1
-          # ...
           @last_healthz_update = Time.now.to_f
         end
 
-        healthz
+        healthz.dup
       end
 
       def start_http_server(host, port, auth, logger)
@@ -98,6 +151,9 @@ module VCAP
         @discover[:uuid]
       end
 
+      # Announces the availability of this component to NATS.
+      # Returns the published configuration of the component,
+      # including the ephemeral port and credentials.
       def register(opts)
         uuid = VCAP.secure_uuid
         type = opts[:type]
@@ -108,6 +164,7 @@ module VCAP
         nats = opts[:nats] || NATS
         auth = [opts[:user] || VCAP.secure_uuid, opts[:password] || VCAP.secure_uuid]
         logger = opts[:logger] || Logger.new(nil)
+        log_counter = opts[:log_counter]
 
         # Discover message limited
         @discover = {
@@ -120,9 +177,12 @@ module VCAP
         }
 
         # Varz is customizable
-        @varz = @discover.dup
-        @varz[:num_cores] = VCAP.num_cores
-        @varz[:config] = sanitize_config(opts[:config]) if opts[:config]
+        varz.synchronize do
+          varz.merge!(@discover.dup)
+          varz[:num_cores] = VCAP.num_cores
+          varz[:config] = sanitize_config(opts[:config]) if opts[:config]
+          varz[:log_counter] = log_counter if log_counter
+        end
 
         @healthz = "ok\n".freeze
 
@@ -140,6 +200,8 @@ module VCAP
 
         # Also announce ourselves on startup..
         nats.publish('vcap.component.announce', @discover.to_json)
+
+        @discover
       end
 
       def update_discover_uptime

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcap_common
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vmstat
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +203,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: common vcap classes/methods
 email:
 - derek.collison@gmail.com
@@ -194,32 +242,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/vcap/component.rb
-- lib/vcap/user_pools/user_pool.rb
-- lib/vcap/user_pools/user_pool_util.rb
-- lib/vcap/user_pools/user_ops.rb
-- lib/vcap/spec/em.rb
-- lib/vcap/spec/forked_component.rb
-- lib/vcap/spec/forked_component/base.rb
-- lib/vcap/spec/forked_component/nats_server.rb
-- lib/vcap/priority_queue.rb
+- lib/json_message.rb
+- lib/services/api/async_requests.rb
+- lib/services/api/clients/service_gateway_client.rb
+- lib/services/api/const.rb
+- lib/services/api/messages.rb
+- lib/services/api/util.rb
+- lib/services/api.rb
 - lib/vcap/common.rb
+- lib/vcap/component.rb
+- lib/vcap/config.rb
 - lib/vcap/fiber_tracing.rb
-- lib/vcap/subprocess.rb
-- lib/vcap/quota.rb
+- lib/vcap/priority_queue.rb
 - lib/vcap/process_utils.rb
+- lib/vcap/quota.rb
 - lib/vcap/rolling_metric.rb
-- lib/vcap/config.rb
 - lib/vcap/sorted_set_utils.rb
-- lib/json_message.rb
-- lib/services/api.rb
-- lib/services/api/multipart.rb
-- lib/services/api/util.rb
-- lib/services/api/const.rb
-- lib/services/api/async_requests.rb
-- lib/services/api/messages.rb
-- lib/services/api/clients/sds_client.rb
-- lib/services/api/clients/service_gateway_client.rb
+- lib/vcap/spec/em.rb
+- lib/vcap/spec/forked_component/base.rb
+- lib/vcap/spec/forked_component/nats_server.rb
+- lib/vcap/spec/forked_component.rb
+- lib/vcap/subprocess.rb
+- lib/vcap/user_pools/user_ops.rb
+- lib/vcap/user_pools/user_pool.rb
+- lib/vcap/user_pools/user_pool_util.rb
 homepage: http://github.com/vmware-ac/core
 licenses: []
 post_install_message: 
@@ -240,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: vcap common

data/lib/services/api/clients/sds_client.rb

@@ -1,84 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-require 'net/http'
-require 'net/http/post/multipart'
-require 'mime/types'
-require 'uri'
-
-require 'services/api/const'
-require 'services/api/messages'
-require 'services/api/multipart'
-
-module VCAP
-  module Services
-    module Api
-    end
-  end
-end
-
-module VCAP::Services::Api
-  class SDSClient
-
-    class SDSErrorResponse < StandardError; end
-    class UnexpectedResponse < StandardError; end
-
-    def initialize(url, upload_token, timeout=60, opts={})
-      @url = url
-      @timeout = timeout
-      @hdrs  = {
-        'Content-Type' => 'application/json',
-      }
-      @upload_hdrs = {
-        'Content-Type' => 'multipart/form-data',
-        SDS_UPLOAD_TOKEN_HEADER => upload_token
-      }
-    end
-
-    def import_from_data(args)
-      resp = perform_multipart_upload("/serialized/#{args[:service]}/#{args[:service_id]}/serialized/data", args[:msg])
-      SerializedURL.decode(resp)
-    end
-
-    protected
-
-    def perform_multipart_upload(path, file_path)
-      # upload file using multipart/form data
-      result = nil
-      uri = URI.parse(@url)
-
-      mime_types = MIME::Types.type_for(file_path) || []
-      mime_types << "application/octet-stream" if mime_types.empty?
-
-      if EM.reactor_running?
-        payload = {:_method => 'put', :data_file => EM::StreamUploadIO.new(file_path, mime_types[0])}
-        multipart = EM::Multipart.new(payload, @upload_hdrs)
-        url = URI.parse(uri.to_s + path)
-        http = AsyncHttpMultiPartUpload.fibered(url, @timeout, multipart)
-        raise UnexpectedResponse, "Error uploading #{file_path} to serialized_data_server #{@url}: #{http.error}" unless http.error.empty?
-        code = http.response_header.status.to_i
-        body = http.response
-      else
-        payload = {:_method => 'put', :data_file => UploadIO.new(file_path, mime_types[0])}
-        req = Net::HTTP::Post::Multipart.new(path, payload, @upload_hdrs)
-        resp = Net::HTTP.new(uri.host, uri.port).start do |http|
-          http.request(req)
-        end
-        code = resp.code.to_i
-        body = resp.body
-      end
-      case code
-      when 200
-        body
-      when 400
-        raise SDSErrorResponse, "Fail to upload the file to serialization_data_server."
-      when 403
-        raise SDSErrorResponse, "You are forbidden to access serialization_data_server."
-      when 404
-        raise SDSErrorResponse, "Not found in serialization_data_server."
-      when 501
-        raise SDSErrorResponse, "Serialized data file is recognized, but file not found in serialization_data_server."
-      else
-        raise UnexpectedResponse, "Unexpected exception in serialization_data_server: #{(uri.to_s + path)} #{code} #{body}"
-      end
-    end
-  end
-end

data/lib/services/api/multipart.rb

@@ -1,191 +0,0 @@
-# Copyright (c) 2009-2011 VMware, Inc.
-require 'eventmachine'
-require 'em-http-request'
-
-# monkey-patch for em-http-request to support multipart file upload
-
-module EventMachine
-  class StreamUploadIO
-    attr_reader :args, :filename, :basename, :size, :content_type
-    def initialize(filename, content_type, args={})
-      # disable http chunking
-      @args = args.merge({:http_chunks => false})
-      @filename = filename
-      # FIXME how to catch exception and log it
-      begin
-        @basename = File.basename(filename)
-        @size = File.size(filename)
-      rescue => e
-        # size == 0, the part will be injected
-        @size = 0
-      end
-      @content_type = content_type
-    end
-
-    def add_extra_size(extra_size)
-      @size += extra_size
-    end
-
-    def length
-      @size
-    end
-
-    def stream_file_data
-      true
-    end
-  end
-
-  module Part
-    def self.create(boundary, k, v)
-      if v.respond_to?(:stream_file_data)
-        FilePart.new(boundary, k, v)
-      else
-        ParamPart.new(boundary, k, v)
-      end
-    end
-
-    def to_io
-      @io
-    end
-
-    def length
-      @io.size
-    end
-
-    def send_part(conn, parts, idx)
-    end
-
-    def get_next_part(parts, idx)
-      next_idx = idx.to_i + 1
-      if parts && next_idx < parts.size && next_idx >=0
-        next_part = parts[next_idx]
-      else
-        nil
-      end
-      next_part
-    end
-
-    def send_next_part(conn, parts, idx)
-      next_part = get_next_part(parts, idx)
-      next_part.send_part(conn, parts, idx+1) if next_part
-    end
-
-  end
-
-  class ParamPart
-    include Part
-    def initialize(boundary, name, value)
-      @boundary = boundary
-      @name = name
-      part = ''
-      part << "--#{@boundary}\r\n"
-      part << "Content-Disposition: form-data; name=\"#{@name.to_s}\"\r\n"
-      part << "\r\n"
-      part << "#{value.to_s}\r\n"
-      @io = StringIO.new(part)
-    end
-
-    def send_part(conn, parts, idx)
-      conn.send_data @io.string if conn
-      send_next_part(conn, parts, idx)
-    end
-  end
-
-  class EpiloguePart
-    include Part
-    def initialize(boundary)
-      @io = StringIO.new("--#{boundary}--\r\n") #\r\n or \r\n\r\n
-    end
-
-    def send_part(conn, parts, idx)
-      conn.send_data @io.string if conn
-      # this part should be the last part
-    end
-  end
-
-  class FilePart
-    include Part
-    def initialize(boundary, name, upload_io)
-      @boundary = boundary
-      @name = name
-      @io = upload_io
-      @part = ''
-      @part << "--#{boundary}\r\n"
-      @part << "Content-Disposition: form-data; name=\"#{name.to_s}\"; filename=\"#{@io.filename}\"\r\n"
-      @part << "Content-Length: #{@io.size}\r\n"
-      @part << "Content-Type: #{@io.content_type}\r\n"
-      @part << "Content-Transfer-Encoding: binary\r\n"
-      @part << "\r\n"
-      @end_part ="\r\n"
-      @io.add_extra_size(@part.size + @end_part.size)
-    end
-
-    def send_part(conn, parts, idx)
-      conn.send_data @part
-      streamer = EM::FileStreamer.new(conn, @io.filename, @io.args)
-      streamer.callback {
-        conn.send_data @end_part
-        send_next_part(conn, parts, idx)
-      }
-    end
-  end
-
-  class Multipart
-    DEFAULT_BOUNDARY = "-----------RubyEMMultiPartPost"
-    attr_reader :parts, :ps, :content_type, :content_length, :boundary, :headers
-    def initialize(params, headers={}, boundary=DEFAULT_BOUNDARY)
-      @parts = params.map{ |k,v| Part.create(boundary, k, v) }
-      @parts << EpiloguePart.new(boundary)
-      # inject the part with length = 0
-      @ps = @parts.select{ |part| part.length > 0 }
-      @content_type = "multipart/form-data; boundary=#{boundary}"
-      @content_length = 0
-      @parts.each do |part|
-        @content_length += part.length
-      end
-      @boundary = boundary
-      @headers = headers
-    end
-
-    def send_body(conn)
-      if conn && conn.error.nil? && @parts.size > 0
-        part = @parts.first
-        part.send_part(conn, @parts, 0)
-      end
-    end
-  end
-end
-
-## Support to streaming the file when sending body
-## TODO FIXME this patch whether depends on specified version???
-module EventMachine
-  class HttpClient
-    alias_method :original_send_request, :send_request
-    def multipart_request?
-      (@req.method == 'POST' or @req.method == 'PUT') and @options[:multipart]
-    end
-
-    def send_request(head, body)
-      unless multipart_request?
-        original_send_request(head, body)
-      else
-        body = normalize_body(body)
-        multipart = @options[:multipart]
-        query = @options[:query]
-
-        head['content-length'] = multipart.content_length
-        head['content-type'] = multipart.content_type
-        extra_headers = {}
-        extra_headers = multipart.headers.reject { |k, v| %w(content-length content-type).include?(k.to_s.downcase) }
-        head.merge!  extra_headers
-
-        request_header ||= encode_request(@req.method, @req.uri, query, @conn.opts.proxy)
-        request_header << encode_headers(head)
-        request_header << CRLF
-        @conn.send_data request_header
-
-        multipart.send_body(@conn)
-      end
-    end
-  end
-end