1. 04 11月, 2012 1 次提交
  2. 01 11月, 2012 11 次提交
  3. 30 10月, 2012 14 次提交
    • A
      rbd: define image specification structure · 0d7dbfce
      Alex Elder 提交于
      Group the fields that uniquely specify an rbd image into a new
      reference-counted rbd_spec structure.  This structure will be used
      to describe the desired image when mapping an image, and when
      probing parent images in layered rbd devices.  Replace the set of
      fields in the rbd device structure with a pointer to a dynamically
      allocated rbd_spec.
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
      0d7dbfce
    • A
      rbd: have rbd_add_parse_args() return error · dc79b113
      Alex Elder 提交于
      Change the interface to rbd_add_parse_args() so it returns an
      error code rather than a pointer.  Return the ceph_options result
      via a pointer whose address is passed as an argument.
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
      dc79b113
    • A
      rbd: pass and populate rbd_options structure · 4e9afeba
      Alex Elder 提交于
      Have the caller pass the address of an rbd_options structure to
      rbd_add_parse_args(), to be initialized with the information
      gleaned as a result of the parse.
      
      I know, this is another near-reversal of a recent change...
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
      4e9afeba
    • A
      rbd: remove snap_name arg from rbd_add_parse_args() · 819d52bf
      Alex Elder 提交于
      The snapshot name returned by rbd_add_parse_args() just gets saved
      in the rbd_dev eventually.  So just do that inside that function and
      do away with the snap_name argument, both in rbd_add_parse_args()
      and rbd_dev_set_mapping().
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
      819d52bf
    • A
      rbd: remove options args from rbd_add_parse_args() · f28e565a
      Alex Elder 提交于
      They "options" argument to rbd_add_parse_args() (and it's partner
      options_size) is now only needed within the function, so there's no
      need to have the caller allocate and pass the options buffer.  Just
      allocate the options buffer within the function using dup_token().
      
      Also distinguish between failures due to failed memory allocation
      and failing because a required argument was missing.
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
      f28e565a
    • A
      rbd: get rid of snap_name_len · e5c35534
      Alex Elder 提交于
      The value returned in the "snap_name_len" argument to
      rbd_add_parse_args() is never actually used, so get rid of it.
      
      The snap_name_len recorded in rbd_dev_v2_snap_name() is not
      useful either, so get rid of that too.
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
      e5c35534
    • A
      rbd: do all argument parsing in one place · 0ddebc0c
      Alex Elder 提交于
      This patch makes rbd_add_parse_args() be the single place all
      argument parsing occurs for an image map request:
          - Move the ceph_parse_options() call into that function
          - Use local variables rather than parameters to hold the list
            of monitor addresses supplied
          - Rather than returning it, pass the snapshot name (and its
            length) back via parameters
          - Have the function return a ceph_options structure pointer
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
      0ddebc0c
    • A
      rbd: move ceph_parse_options() call up · 78cea76e
      Alex Elder 提交于
      Move option parsing out of rbd_get_client() and into its caller.
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
      78cea76e
    • A
      rbd: rename snap_exists field · daba5fdb
      Alex Elder 提交于
      A Boolean field "snap_exists" in an rbd mapping is used to indicate
      whether a mapped snapshot has been removed from an image's snapshot
      context, to stop sending requests for that snapshot as soon as we
      know it's gone.
      
      Generalize the interpretation of this field so it applies to
      non-snapshot (i.e. "head") mappings.  That is, define its value
      to be false until the mapping has been set, and then define it to be
      true for both snapshot mappings or head mappings.
      
      Rename the field "exists" to reflect the broader interpretation.
      The rbd_mapping structure is on its way out, so move the field
      back into the rbd_device structure.
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
      daba5fdb
    • A
      rbd: move snap info out of rbd_mapping struct · 971f839a
      Alex Elder 提交于
      Moving the snap_id and snap_name fields into the separate
      rbd_mapping structure was misguided.  (And in time, perhaps
      we'll do away with that structure altogether...)
      
      Move these fields back into struct rbd_device.
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
      971f839a
    • A
      rbd: make pool_id a 64 bit value · 86992098
      Alex Elder 提交于
      If a format 2 image has a parent, its pool id will be specified
      using a 64-bit value.  Change the pool id we save for an image to
      match that.
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
      86992098
    • A
      rbd: remove snapshots on error in rbd_add() · 41f38c2b
      Alex Elder 提交于
      If rbd_dev_snaps_update() has ever been called for an rbd device
      structure there could be snapshot structures on its snaps list.
      In rbd_add(), this function is called but a subsequent error
      path neglected to clean up any of these snapshots.
      
      Add a call to rbd_remove_all_snaps() in the appropriate spot to
      remedy this.  Change a couple of error labels to be a little
      clearer while there.
      
      Drop the leading underscores from the function name; there's nothing
      special about that function that they might signify.  As suggested
      in review, the leading underscores in __rbd_remove_snap_dev() have
      been removed as well.
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
      41f38c2b
    • A
      rbd: simplify rbd_rq_fn() · f7760dad
      Alex Elder 提交于
      When processing a request, rbd_rq_fn() makes clones of the bio's in
      the request's bio chain and submits the results to osd's to be
      satisfied.  If a request bio straddles the boundary between objects
      backing the rbd image, it must be represented by two cloned bio's,
      one for the first part (at the end of one object) and one for the
      second (at the beginning of the next object).
      
      This has been handled by a function bio_chain_clone(), which
      includes an interface only a mother could love, and which has
      been found to have other problems.
      
      This patch defines two new fairly generic bio functions (one which
      replaces bio_chain_clone()) to help out the situation, and then
      revises rbd_rq_fn() to make use of them.
      
      First, bio_clone_range() clones a portion of a single bio, starting
      at a given offset within the bio and including only as many bytes
      as requested.  As a convenience, a request to clone the entire bio
      is passed directly to bio_clone().
      
      Second, bio_chain_clone_range() performs a similar function,
      producing a chain of cloned bio's covering a sub-range of the
      source chain.  No bio_pair structures are used, and if successful
      the result will represent exactly the specified range.
      
      Using bio_chain_clone_range() makes bio_rq_fn() a little easier
      to understand, because it avoids the need to pass very much
      state information between consecutive calls.  By avoiding the need
      to track a bio_pair structure, it also eliminates the problem
      described here:  http://tracker.newdream.net/issues/2933
      
      Note that a block request (and therefore the complete length of
      a bio chain processed in rbd_rq_fn()) is an unsigned int, while
      the result of rbd_segment_length() is u64.  This change makes
      this range trunctation explicit, and trips a bug if the the
      segment boundary is too far off.
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
      f7760dad
    • S
      libceph: fix osdmap decode error paths · 0ed7285e
      Sage Weil 提交于
      Ensure that we set the err value correctly so that we do not pass a 0
      value to ERR_PTR and confuse the calling code.  (In particular,
      osd_client.c handle_map() will BUG(!newmap)).
      Signed-off-by: NSage Weil <sage@inktank.com>
      Reviewed-by: NAlex Elder <elder@inktank.com>
      0ed7285e
  4. 27 10月, 2012 13 次提交
  5. 10 10月, 2012 1 次提交