]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
11 years agoautomake cleanup: renaming buildtest 575/head
Roald J. van Loon [Sat, 7 Sep 2013 14:37:10 +0000 (16:37 +0200)]
automake cleanup: renaming buildtest

The previous name could cause confusion (it's not only used to test
build libcommon anymore).

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoautomake cleanup: moving rados tool to tools subdir
Roald J. van Loon [Sat, 7 Sep 2013 13:36:07 +0000 (15:36 +0200)]
automake cleanup: moving rados tool to tools subdir

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoautomake cleanup: moving misc tools to tools subdir
Roald J. van Loon [Sat, 7 Sep 2013 13:33:10 +0000 (15:33 +0200)]
automake cleanup: moving misc tools to tools subdir

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoautomake cleanup: moving tests to test subdir
Roald J. van Loon [Sat, 7 Sep 2013 13:27:33 +0000 (15:27 +0200)]
automake cleanup: moving tests to test subdir

This are tests and should be in the src/test subdir.

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoautomake cleanup: moving code away from include to common
Roald J. van Loon [Sat, 7 Sep 2013 13:24:00 +0000 (15:24 +0200)]
automake cleanup: moving code away from include to common

Includes should only be includes. Moving C code to libcommon.

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoautomake cleanup: moving hobject from os to common
Roald J. van Loon [Sat, 7 Sep 2013 13:16:27 +0000 (15:16 +0200)]
automake cleanup: moving hobject from os to common

This file is used by libcommon, so lets put it in src/common instead of
src/os.

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoautomake cleanup: renamed inttypes.h
Roald J. van Loon [Sat, 7 Sep 2013 12:07:52 +0000 (14:07 +0200)]
automake cleanup: renamed inttypes.h

- In "includes", inttypes.h was cluttering the system's one. This caused
  random build errors on some systems/in some conditions. Renaming it.
- Add emergency defs of PRI*64 headers when int_types.h does not define
  them (which, unfortunately, can happen on some systems).

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoautomake cleanup: adding vta support to configure
Roald J. van Loon [Sat, 7 Sep 2013 11:14:05 +0000 (13:14 +0200)]
automake cleanup: adding vta support to configure

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoMerge pull request #572 from roaldvanloon/wip-fix-buildtests
Sage Weil [Sat, 7 Sep 2013 20:31:29 +0000 (13:31 -0700)]
Merge pull request #572 from roaldvanloon/wip-fix-buildtests

fix: build tests need libcrc.la

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agofix: build tests need libcrc.la 572/head
Roald J. van Loon [Sat, 7 Sep 2013 17:25:17 +0000 (19:25 +0200)]
fix: build tests need libcrc.la

Build tests are failing because the need crc32c.cc's functions, so we
need to link them against libcrc.la

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoMerge pull request #570 from roaldvanloon/wip-cleanup-globals
Sage Weil [Sat, 7 Sep 2013 15:45:02 +0000 (08:45 -0700)]
Merge pull request #570 from roaldvanloon/wip-cleanup-globals

cleanup: state_name in NamedState init list

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agocleanup: state_name in NamedState init list 570/head
Roald J. van Loon [Sat, 7 Sep 2013 09:15:00 +0000 (11:15 +0200)]
cleanup: state_name in NamedState init list

Added const char *state_name to the NamedState initializer list. This
correctly enforces a state name.

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoMerge pull request #568 from roaldvanloon/wip-cleanup-globals
Sage Weil [Fri, 6 Sep 2013 21:02:03 +0000 (14:02 -0700)]
Merge pull request #568 from roaldvanloon/wip-cleanup-globals

Wip cleanup globals

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Fri, 6 Sep 2013 16:50:41 +0000 (09:50 -0700)]
Merge remote-tracking branch 'gh/next'

11 years agocommon/crc32c_intel_fast: avoid reading partial trailing word
Sage Weil [Thu, 5 Sep 2013 04:29:11 +0000 (21:29 -0700)]
common/crc32c_intel_fast: avoid reading partial trailing word

The optimized intel code reads in word-sized chunks, knowing that the
allocator will only hand out memory in word-sized increments.   This makes
valgrind unhappy.  Whitelisting doesn't work because for some reason there
is no caller context (probably because of some interaction with yasm?).

Instead, just use the baseline code for the last few bytes.  This should
not be significant.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agocleanup: passing context to NamedState for ceph_clock 568/head
Roald J. van Loon [Fri, 6 Sep 2013 08:33:19 +0000 (10:33 +0200)]
cleanup: passing context to NamedState for ceph_clock

This makes the constructor call on the subclasses explicit, and passes
the cct to the NamedState constructor. This cct is used by ceph_clock
to set enter_time.

Removes the last reference to g_ceph_context from libosd.

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agocleanup: globals from libosd
Roald J. van Loon [Fri, 6 Sep 2013 08:11:08 +0000 (10:11 +0200)]
cleanup: globals from libosd

There are some new globals introduced in libosd lately. This patch
cleans them.

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoMerge pull request #567 from roaldvanloon/wip-cleanup-globals
Sage Weil [Thu, 5 Sep 2013 20:29:10 +0000 (13:29 -0700)]
Merge pull request #567 from roaldvanloon/wip-cleanup-globals

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agocleanup: reduced number of pointer indirection in osd 567/head
Roald J. van Loon [Sat, 31 Aug 2013 21:10:14 +0000 (23:10 +0200)]
cleanup: reduced number of pointer indirection in osd

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agocleanup: removing globals from common/obj_bencher
Roald van Loon [Wed, 28 Aug 2013 14:56:23 +0000 (16:56 +0200)]
cleanup: removing globals from common/obj_bencher

This file is in common/ but cant be included in libcommon.la because of
this reference. Removing it, making the binary calling it to pass the
correct cephcontext (rados, rest-bench).

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agocleanup: removing refs to globals from libosd
Roald van Loon [Wed, 28 Aug 2013 12:02:47 +0000 (14:02 +0200)]
cleanup: removing refs to globals from libosd

Removed almost all references to globals, apart from two;

- In OSD.cc: reference to g_lockdep
- In PG.h: NamedState uses ceph_clock_now(g_ceph_context)

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agocleanup: removed last references to globals from client
Roald van Loon [Wed, 28 Aug 2013 10:11:08 +0000 (12:11 +0200)]
cleanup: removed last references to globals from client

- There were some refs in SyntheticClient to g_(ceph_context|conf), I
  replaced them with client->cct and client->cct->_conf.
- There were some refs in fuse_ll to g_conf, also replaced them with
  client->cct or cfuse->client->cct where applicable.

This makes everything in src/client completely independent from globals.

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoMerge pull request #555 from dachary/master
Sage Weil [Thu, 5 Sep 2013 15:51:21 +0000 (08:51 -0700)]
Merge pull request #555 from dachary/master

minor documentation fixes

11 years agoosd/ReplicatedPG: set reply versions for pg ops (PGLS)
Sage Weil [Wed, 4 Sep 2013 05:41:17 +0000 (22:41 -0700)]
osd/ReplicatedPG: set reply versions for pg ops (PGLS)

Returning the current version for the pgid and last_user_version makes
some sense here.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit b05f7ea5199fc190a3be887fac4d74417461e1ce)

11 years agoosd/ReplicatedPG: set reply versions on dup op ACK
Sage Weil [Wed, 4 Sep 2013 05:40:42 +0000 (22:40 -0700)]
osd/ReplicatedPG: set reply versions on dup op ACK

All other MOSDOpReply creators do this, with the exception of the pg
op.

Fixes: #6222
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit 5148aac73d50593217455619bef95b8e1b296e10)

11 years agorgw: flush pending data when completing multipart part upload
Yehuda Sadeh [Fri, 23 Aug 2013 22:39:20 +0000 (15:39 -0700)]
rgw: flush pending data when completing multipart part upload

Fixes: #6111
Backport: dumpling
When completing the part upload we need to flush any data that we
aggregated and didn't flush yet. With earlier code didn't have to deal
with it as for multipart upload we didn't have any pending data.
What we do now is we call the regular atomic data completion
function that takes care of it.

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agolibrados: make note of which calls steal the bufferlist contents
Sage Weil [Wed, 4 Sep 2013 23:39:34 +0000 (16:39 -0700)]
librados: make note of which calls steal the bufferlist contents

This is an unfortunate feature of the API, but it can't be changed without
potentially breaking users.

Fixes: #5989
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agorgw: check object name after rebuilding it in S3 POST
Yehuda Sadeh [Tue, 27 Aug 2013 02:46:43 +0000 (19:46 -0700)]
rgw: check object name after rebuilding it in S3 POST

Fixes: #6088
Backport: bobtail, cuttlefish, dumpling

When posting an object it is possible to provide a key
name that refers to the original filename, however we
need to verify that in the end we don't end up with an
empty object name.

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agoMerge branch 'wip-6078' into next
Yehuda Sadeh [Wed, 4 Sep 2013 23:18:38 +0000 (16:18 -0700)]
Merge branch 'wip-6078' into next

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agorgw: fix certain return status cases in CORS
Yehuda Sadeh [Thu, 29 Aug 2013 04:25:20 +0000 (21:25 -0700)]
rgw: fix certain return status cases in CORS

Change return values in certain cases, reorder
checks, etc.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: add COPY method to be handled by CORS
Yehuda Sadeh [Thu, 29 Aug 2013 04:24:36 +0000 (21:24 -0700)]
rgw: add COPY method to be handled by CORS

Was missing this http method.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: fix CORS rule check
Yehuda Sadeh [Wed, 28 Aug 2013 02:38:45 +0000 (19:38 -0700)]
rgw: fix CORS rule check

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: don't handle CORS if rule not found (is NULL)
Yehuda Sadeh [Wed, 28 Aug 2013 02:38:18 +0000 (19:38 -0700)]
rgw: don't handle CORS if rule not found (is NULL)

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: tie CORS header response to all relevant operations
Yehuda Sadeh [Thu, 22 Aug 2013 20:38:55 +0000 (13:38 -0700)]
rgw: tie CORS header response to all relevant operations

Have the CORS responses on all relevant operations. Also add headers
on failure cases.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: add a generic CORS response handling
Yehuda Sadeh [Thu, 22 Aug 2013 17:00:53 +0000 (10:00 -0700)]
rgw: add a generic CORS response handling

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: OPTIONS request doesn't need to read object info
Yehuda Sadeh [Thu, 22 Aug 2013 00:22:46 +0000 (17:22 -0700)]
rgw: OPTIONS request doesn't need to read object info

This is a bucket-only operation, so we shouldn't look at the
object. Object may not exist and we might respond with Not
Exists response which is not what we want.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: remove use of s->bucket_cors
Yehuda Sadeh [Wed, 21 Aug 2013 21:43:28 +0000 (14:43 -0700)]
rgw: remove use of s->bucket_cors

Some old code still tried to use s->bucket_cors, which was
abandoned in a cleanup work.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agocommon: unit test for crc32c
Sage Weil [Wed, 4 Sep 2013 00:59:30 +0000 (17:59 -0700)]
common: unit test for crc32c

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
11 years agocommon/crc32c_intel_fast: fix compile-time #ifdef
Sage Weil [Wed, 4 Sep 2013 20:14:14 +0000 (13:14 -0700)]
common/crc32c_intel_fast: fix compile-time #ifdef

This wasn't getting built in!

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
11 years agoarch: add NEON cpu feature detection
Sage Weil [Tue, 3 Sep 2013 15:38:31 +0000 (08:38 -0700)]
arch: add NEON cpu feature detection

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
11 years agodoc: Updated usage for --infile syntax. Added zone name for zone syntax.
John Wilkins [Wed, 4 Sep 2013 22:37:14 +0000 (15:37 -0700)]
doc: Updated usage for --infile syntax. Added zone name for zone syntax.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agomon/OSDMonitor: fix POOL_OP_DELETE_SNAP early return
Sage Weil [Wed, 4 Sep 2013 21:42:45 +0000 (14:42 -0700)]
mon/OSDMonitor: fix POOL_OP_DELETE_SNAP early return

Cut&paste goof in 0e85074402cd02b292daadcb5b8e73ac1207d571.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agodoc: Organized into sections. Added zone/region and pool details.
John Wilkins [Wed, 4 Sep 2013 20:28:34 +0000 (13:28 -0700)]
doc: Organized into sections. Added zone/region and pool details.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc/release-notes: v0.68
Sage Weil [Wed, 4 Sep 2013 18:25:56 +0000 (11:25 -0700)]
doc/release-notes: v0.68

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge remote-tracking branch 'gh/wip-6047'
Sage Weil [Wed, 4 Sep 2013 17:43:04 +0000 (10:43 -0700)]
Merge remote-tracking branch 'gh/wip-6047'

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoosd/ReplicatedPG: set reply versions for pg ops (PGLS)
Sage Weil [Wed, 4 Sep 2013 05:41:17 +0000 (22:41 -0700)]
osd/ReplicatedPG: set reply versions for pg ops (PGLS)

Returning the current version for the pgid and last_user_version makes
some sense here.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoosd/ReplicatedPG: set reply versions on dup op ACK
Sage Weil [Wed, 4 Sep 2013 05:40:42 +0000 (22:40 -0700)]
osd/ReplicatedPG: set reply versions on dup op ACK

All other MOSDOpReply creators do this, with the exception of the pg
op.

Fixes: #6222
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agodoc: remove 'Unexpected indentation' from versions doc.
Greg Farnum [Wed, 4 Sep 2013 17:10:03 +0000 (10:10 -0700)]
doc: remove 'Unexpected indentation' from versions doc.

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoMerge pull request #564 from ljagiello/swift_doc_fix
Sage Weil [Wed, 4 Sep 2013 16:28:58 +0000 (09:28 -0700)]
Merge pull request #564 from ljagiello/swift_doc_fix

Correct syntax for generate swift key

Signed-off-by: Lukasz Jagiello <jagiello.lukasz@gmail.com>
11 years agoCorrect syntax for generate swift key 564/head
Lukasz Jagiello [Wed, 4 Sep 2013 14:33:57 +0000 (16:33 +0200)]
Correct syntax for generate swift key

11 years agomon: fix typo and remove redundant sentence 555/head
Loic Dachary [Wed, 4 Sep 2013 10:31:44 +0000 (12:31 +0200)]
mon: fix typo and remove redundant sentence

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomon: fix typo in comment
Loic Dachary [Sat, 31 Aug 2013 21:35:18 +0000 (23:35 +0200)]
mon: fix typo in comment

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agodoc: erasure code ghobject is made of gen_t + shard_t
Loic Dachary [Wed, 28 Aug 2013 21:04:26 +0000 (23:04 +0200)]
doc: erasure code ghobject is made of gen_t + shard_t

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge branch 'next'
Gary Lowell [Wed, 4 Sep 2013 08:37:41 +0000 (01:37 -0700)]
Merge branch 'next'

11 years agov0.68 v0.68
Gary Lowell [Tue, 3 Sep 2013 23:10:31 +0000 (16:10 -0700)]
v0.68

11 years agoMerge branch 'wip-copyfrom'
Sage Weil [Tue, 3 Sep 2013 23:00:28 +0000 (16:00 -0700)]
Merge branch 'wip-copyfrom'

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agodoc: Fix repo URL for Ceph cloning (dev/generatedocs)
Dan Mick [Tue, 3 Sep 2013 22:56:53 +0000 (15:56 -0700)]
doc: Fix repo URL for Ceph cloning (dev/generatedocs)

Signed-off-by: Dan Mick <dan.mick@inktank.com>
11 years agoceph_test_rados: test COPY_FROM 563/head
Sage Weil [Tue, 3 Sep 2013 20:51:31 +0000 (13:51 -0700)]
ceph_test_rados: test COPY_FROM

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: initial COPY_FROM (not viable for large objects)
Sage Weil [Wed, 28 Aug 2013 22:04:16 +0000 (15:04 -0700)]
osd: initial COPY_FROM (not viable for large objects)

Initial pass at COPY_FROM implementation.  This uses COPY_GET to read an
object from another OSD and write it locally.  It chunks the read but
accumulates it all in-memory and commits it at once, so it is only suitable
for smaller objects.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoobjecter, librados: add COPY_FROM operation
Sage Weil [Mon, 26 Aug 2013 23:24:16 +0000 (16:24 -0700)]
objecter, librados: add COPY_FROM operation

This operation will copy an entire object (data, attrs, omap)
atomically.  If the src_version does not match the source object, or
the source object is updated while the copy is in progress, we will
fail with a suitable error code.  By atomic we mean that it will either
successfully copy the entire object in its entirety or it will fail (and
require no cleanup).

Add to C++ librados API only for now.

Signed-off-by: Sage Weil <sage@inktank.com>
Conflicts:

src/include/ceph_strings.cc
src/include/rados.h
src/osd/osd_types.cc

11 years agodoc: Updated manual install to include sync agent, ARM packages, and DNS configuration.
John Wilkins [Tue, 3 Sep 2013 21:20:59 +0000 (14:20 -0700)]
doc: Updated manual install to include sync agent, ARM packages, and DNS configuration.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agoceph_test_rados: add missing kick for rollback
Sage Weil [Tue, 3 Sep 2013 20:58:03 +0000 (13:58 -0700)]
ceph_test_rados: add missing kick for rollback

This was broken by the refactor in 96aaa5e3a371ade8b91ad9ab991d996eaef2cea5
and can make us hang.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agorgw: change watch init ordering, don't distribute if can't
Yehuda Sadeh [Thu, 29 Aug 2013 20:06:33 +0000 (13:06 -0700)]
rgw: change watch init ordering, don't distribute if can't

Backport: dumpling

Moving back the watch initialization after the zone init,
as the zone info holds the control pool name. Since zone
init might need to create a new system object (that needs
to distribute cache), don't try to distribute cache if
watch is not yet initialized.

Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agoosd: provide better version bounds for cls_current_version and ENOENT replies
Greg Farnum [Tue, 3 Sep 2013 17:54:23 +0000 (10:54 -0700)]
osd: provide better version bounds for cls_current_version and ENOENT replies

Following the changes to when we set or increase the user_version, we
want to continue to return the best lower bound we can on the version
of any newly-created object. For ENOENT replies that means returning
info.last_user_version instead of the (potentially-zero) ctx->user_at_version.

Similarly, for cls_current_version we want to return the last version on
the PG rather than the last update to the object in order to provide
sensible version ordering across object deletes and creates.

Update the versions doc so it continues to be precise.

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge remote-tracking branch 'gh/wip-6179'
Sage Weil [Tue, 3 Sep 2013 17:07:26 +0000 (10:07 -0700)]
Merge remote-tracking branch 'gh/wip-6179'

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoMerge pull request #562 from kri5/wip-4365
Yehuda Sadeh [Tue, 3 Sep 2013 15:49:32 +0000 (08:49 -0700)]
Merge pull request #562 from kri5/wip-4365

rgw: Allow wildcard in supported keystone roles.

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: Allow wildcard in supported keystone roles. 455/head 562/head
Christophe Courtaut [Mon, 22 Jul 2013 13:15:38 +0000 (15:15 +0200)]
rgw: Allow wildcard in supported keystone roles.

http://tracker.ceph.com/issues/4365 fixes #4365

Signed-off-by: Christophe Courtaut <christophe.courtaut@gmail.com>
11 years agoosd/ReplicatedPG: set user_version in waiting_for_commit replies
Sage Weil [Tue, 3 Sep 2013 00:08:04 +0000 (17:08 -0700)]
osd/ReplicatedPG: set user_version in waiting_for_commit replies

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd/ReplicatedPG: do not set ctx->user_at_version unless ctx->user_modify
Sage Weil [Sat, 31 Aug 2013 00:20:54 +0000 (17:20 -0700)]
osd/ReplicatedPG: do not set ctx->user_at_version unless ctx->user_modify

Leave ctx->user_at_version set to the previous oi.user_version unless/until
we find that ctx->user_modify is true.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd/ReplicatedPG: do not log a user_version on the snapdir object
Sage Weil [Sat, 31 Aug 2013 00:19:07 +0000 (17:19 -0700)]
osd/ReplicatedPG: do not log a user_version on the snapdir object

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd/ReplicatedPG: log previous user_version on clone
Sage Weil [Sat, 31 Aug 2013 00:18:21 +0000 (17:18 -0700)]
osd/ReplicatedPG: log previous user_version on clone

Nothing relies on this, but it makes sense to me.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd/ReplicatedPG: do not log user_version on deletion events
Sage Weil [Sat, 31 Aug 2013 00:22:26 +0000 (17:22 -0700)]
osd/ReplicatedPG: do not log user_version on deletion events

Or snap trim events where we are adjusting the head's snapdir attr.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd/PG: only raise PG's last_user_version if entry is >
Sage Weil [Sat, 31 Aug 2013 00:15:56 +0000 (17:15 -0700)]
osd/PG: only raise PG's last_user_version if entry is >

We may have pg entries that do not increase the user_version at all (i.e.,
they may be 0).  Do not update the last_user_version in that case as we
need it to remain an upper bound.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: debug user_versions a bit
Sage Weil [Sat, 31 Aug 2013 00:06:30 +0000 (17:06 -0700)]
osd: debug user_versions a bit

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosdc/Objecter: fix dereference of NULL pg_pool_t
Sage Weil [Sun, 1 Sep 2013 15:42:23 +0000 (08:42 -0700)]
osdc/Objecter: fix dereference of NULL pg_pool_t

Make sure we don't dereference a NULL pointer.  Note that we check a
bit further down if the target pool does not exist and return the proper
error.

Bug was reliably reproduced by

 ./ceph_test_rados_api_watch_notify --gtest_filter=LibRadosWatchNotify.WatchNotifyTimeoutTestPP

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoValidate S3 tokens against Keystone
Roald J. van Loon [Fri, 9 Aug 2013 11:31:10 +0000 (13:31 +0200)]
Validate S3 tokens against Keystone

- Added config option to allow S3 to use Keystone auth
- Implemented JSONDecoder for KeystoneToken
- RGW_Auth_S3::authorize now uses rgw_store_user_info on keystone auth
- Minor fix in get_canon_resource; dout is now after the assignment

Reviewed-by: Yehuda Sadeh<yehuda@inktank.com>
Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoMerge pull request #561 from ceph/wip-6178
Sage Weil [Sat, 31 Aug 2013 23:46:52 +0000 (16:46 -0700)]
Merge pull request #561 from ceph/wip-6178

os: LevelDBStore: ignore ENOENT files when estimating store size

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge branch 'next'
Sage Weil [Sat, 31 Aug 2013 17:31:31 +0000 (10:31 -0700)]
Merge branch 'next'

11 years agomon: fix uninitialized Op field
Roald J. van Loon [Sat, 31 Aug 2013 17:30:14 +0000 (10:30 -0700)]
mon: fix uninitialized Op field

- Uninitialized field in MonitorLevelDB::Op causes random build errors.

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoautomake cleanup: uninitialized version_t
Roald J. van Loon [Fri, 30 Aug 2013 21:05:52 +0000 (23:05 +0200)]
automake cleanup: uninitialized version_t

This sometimes gives a completely random uint64_t value, because it is
potentially used uninitialized.

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
11 years agoMerge pull request #541 from ceph/wip-6036
Sage Weil [Sat, 31 Aug 2013 00:02:49 +0000 (17:02 -0700)]
Merge pull request #541 from ceph/wip-6036

osd objecter; copy-get

Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoosd/ReplicatedPG: do not requeue if not primary 541/head
Sage Weil [Tue, 27 Aug 2013 22:01:02 +0000 (15:01 -0700)]
osd/ReplicatedPG: do not requeue if not primary

This saves us a bit of work, since we will discard the op anyway if
we aren't primary (or even if we become primary again before we get to
it).

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: COPY_GET operation
Sage Weil [Tue, 27 Aug 2013 22:25:50 +0000 (15:25 -0700)]
osd: COPY_GET operation

Add new rados operation to copy all user-visible content for an object
in a simple, safe way.  Use a new object_copy_cursor_t to keep track of
our position.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd/ReplicatedPG: factor {execute,reply}_ctx() out of do_op()
Sage Weil [Sun, 25 Aug 2013 04:58:11 +0000 (21:58 -0700)]
osd/ReplicatedPG: factor {execute,reply}_ctx() out of do_op()

Separate the processing of an OpContext from the preamble and
allocation, so that we can delay the execution for some ops (like the
COPYFROM operation we're about to add).

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: feed OSDMaps to the Objecter
Sage Weil [Sat, 17 Aug 2013 06:33:06 +0000 (23:33 -0700)]
osd: feed OSDMaps to the Objecter

Feed every map message we see (that isn't discarded for some other
reason) to the Objecter.  It has the same continuity requirements that
the OSD has, so it should be satisfied with what we get.  It can also
request maps via our MonClient.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: add an Objecter instance
Sage Weil [Sat, 17 Aug 2013 06:17:03 +0000 (23:17 -0700)]
osd: add an Objecter instance

It gets its own lock, timer, and osdmap.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: discriminate based on connection messenger, not peer type
Sage Weil [Mon, 26 Aug 2013 20:58:47 +0000 (13:58 -0700)]
osd: discriminate based on connection messenger, not peer type

Replace ->get_source().is_osd() checks and instead see if it is the
cluster_messenger so that we do not confuse ourselves when we get
legit requests from other OSDs on our public interface.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoceph-osd: rename msgr vars
Sage Weil [Sat, 17 Aug 2013 23:23:24 +0000 (16:23 -0700)]
ceph-osd: rename msgr vars

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: add a separate messenger for the Objecter
Sage Weil [Sat, 17 Aug 2013 06:03:26 +0000 (23:03 -0700)]
osd: add a separate messenger for the Objecter

We will give the OSD's Objecter its own messenger so that it does not
interfere with the OSD when it marks things up or down.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd/ReplicatedPG: add whitespace
Sage Weil [Mon, 19 Aug 2013 04:26:44 +0000 (21:26 -0700)]
osd/ReplicatedPG: add whitespace

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: less whitespace
Sage Weil [Sat, 17 Aug 2013 06:45:14 +0000 (23:45 -0700)]
osd: less whitespace

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosdc/Objecter: allow ops to be canceled
Sage Weil [Sun, 18 Aug 2013 00:01:53 +0000 (17:01 -0700)]
osdc/Objecter: allow ops to be canceled

This is useful in general, and specifically will be useful for the
rados COPY operation.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosdc/Objecter: only request map on startup if epoch == 0
Sage Weil [Sat, 17 Aug 2013 06:27:39 +0000 (23:27 -0700)]
osdc/Objecter: only request map on startup if epoch == 0

Normal clients have no map and need one to get started.  If we are the
OSD, we will already have one and will get fed maps as they come in.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd, objecter: clean up assert_ver()
Sage Weil [Sun, 25 Aug 2013 18:12:44 +0000 (11:12 -0700)]
osd, objecter: clean up assert_ver()

Create a separate union in the args and clean up the code a bit so that
this doesn't reuse the (unrelated) watch helpers.  No change in
protocol.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd/ReplicatedPG: drop src_obc.clear() calls
Sage Weil [Sat, 24 Aug 2013 04:34:28 +0000 (21:34 -0700)]
osd/ReplicatedPG: drop src_obc.clear() calls

These are all about to go out of scope; no need to clear them
explicitly.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoos/ObjectStore: add bufferlist variant of setattrs
Sage Weil [Wed, 21 Aug 2013 05:23:54 +0000 (22:23 -0700)]
os/ObjectStore: add bufferlist variant of setattrs

And hopefully we can kill the bufferptr ones someday!

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agounittest_lfnindex testing older HASH_INDEX_TAG
David Zafman [Fri, 30 Aug 2013 23:17:16 +0000 (16:17 -0700)]
unittest_lfnindex testing older HASH_INDEX_TAG

Switch to work with new HOBJECT_WITH_POOL

fixes: #6196

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agodoc/rados/operations/pools: remove experimental note about pg splitting
Sage Weil [Fri, 30 Aug 2013 22:41:02 +0000 (15:41 -0700)]
doc/rados/operations/pools: remove experimental note about pg splitting

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #560 from ceph/wip-6032-cache-objecter
Sage Weil [Fri, 30 Aug 2013 22:24:41 +0000 (15:24 -0700)]
Merge pull request #560 from ceph/wip-6032-cache-objecter

Wip 6032 cache objecter

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #554 from ceph/wip-tier-interface
Gregory Farnum [Fri, 30 Aug 2013 21:13:25 +0000 (14:13 -0700)]
Merge pull request #554 from ceph/wip-tier-interface

Specify a user and pg_pool_t interface for tiering/caching specifications

Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>