]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoMerge pull request #5822 from SUSE/wip-12837-firefly
Loic Dachary [Tue, 20 Oct 2015 23:02:08 +0000 (01:02 +0200)]
Merge pull request #5822 from SUSE/wip-12837-firefly

WBThrottle::clear_object: signal on cond when we reduce throttle values

Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #6325 from dachary/wip-13041-firefly
Loic Dachary [Tue, 20 Oct 2015 19:48:39 +0000 (21:48 +0200)]
Merge pull request #6325 from dachary/wip-13041-firefly

common/Thread:pthread_attr_destroy(thread_attr) when done with it

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6091 from SUSE/wip-13252-firefly
Loic Dachary [Tue, 20 Oct 2015 19:46:28 +0000 (21:46 +0200)]
Merge pull request #6091 from SUSE/wip-13252-firefly

mon: does not check for IO errors on every transaction

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6087 from SUSE/wip-13244-firefly
Loic Dachary [Tue, 20 Oct 2015 19:45:19 +0000 (21:45 +0200)]
Merge pull request #6087 from SUSE/wip-13244-firefly

client nonce collision due to unshared pid namespaces

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6010 from liewegas/wip-globalid-firefly
Loic Dachary [Tue, 20 Oct 2015 19:44:32 +0000 (21:44 +0200)]
Merge pull request #6010 from liewegas/wip-globalid-firefly

increase globalid default for firefly

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5991 from SUSE/wip-13043-firefly
Loic Dachary [Tue, 20 Oct 2015 19:43:33 +0000 (21:43 +0200)]
Merge pull request #5991 from SUSE/wip-13043-firefly

ThreadPool add/remove work queue methods not thread safe

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5988 from SUSE/wip-13038-firefly
Loic Dachary [Tue, 20 Oct 2015 19:42:28 +0000 (21:42 +0200)]
Merge pull request #5988 from SUSE/wip-13038-firefly

PG::handle_advance_map: on_pool_change after handling the map change

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5820 from SUSE/wip-12845-firefly
Loic Dachary [Tue, 20 Oct 2015 19:41:19 +0000 (21:41 +0200)]
Merge pull request #5820 from SUSE/wip-12845-firefly

osd/PGLog.cc: 732: FAILED assert(log.log.size() == log_keys_debug.size())

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5814 from SUSE/wip-12840-firefly
Loic Dachary [Tue, 20 Oct 2015 19:40:28 +0000 (21:40 +0200)]
Merge pull request #5814 from SUSE/wip-12840-firefly

recursive lock of md_config_t (0)

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5813 from SUSE/wip-12822-firefly
Loic Dachary [Tue, 20 Oct 2015 19:39:32 +0000 (21:39 +0200)]
Merge pull request #5813 from SUSE/wip-12822-firefly

ceph-fuse crash in test_client_recovery

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5726 from ceph/wip-12752
Loic Dachary [Tue, 20 Oct 2015 19:37:58 +0000 (21:37 +0200)]
Merge pull request #5726 from ceph/wip-12752

is_new_interval() fixes

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5698 from tchaikov/wip-12638-firefly
Loic Dachary [Tue, 20 Oct 2015 19:37:01 +0000 (21:37 +0200)]
Merge pull request #5698 from tchaikov/wip-12638-firefly

mon: add a cache layer over MonitorDBStore

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5619 from liewegas/wip-journal-firefly
Loic Dachary [Tue, 20 Oct 2015 19:35:56 +0000 (21:35 +0200)]
Merge pull request #5619 from liewegas/wip-journal-firefly

os/FileJournal: Fix journal write fail, align for direct io

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
9 years agoMerge pull request #5360 from ceph/wip-11786.firefly
Loic Dachary [Tue, 20 Oct 2015 19:31:52 +0000 (21:31 +0200)]
Merge pull request #5360 from ceph/wip-11786.firefly

mon: MonitorDBStore: get_next_key() only if prefix matches

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5236 from SUSE/wip-12312-firefly
Loic Dachary [Tue, 20 Oct 2015 19:30:04 +0000 (21:30 +0200)]
Merge pull request #5236 from SUSE/wip-12312-firefly

mon: adding exsting pool as tier with --force-nonempty clobbers removed_snaps

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5050 from SUSE/wip-12015-firefly
Loic Dachary [Tue, 20 Oct 2015 19:28:31 +0000 (21:28 +0200)]
Merge pull request #5050 from SUSE/wip-12015-firefly

LibRadosTwoPools[EC]PP.PromoteSnap failure

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6207 from SUSE/wip-13417-firefly
Loic Dachary [Tue, 20 Oct 2015 11:09:38 +0000 (13:09 +0200)]
Merge pull request #6207 from SUSE/wip-13417-firefly

Fix -Wno-format and -Werror=format-security options clash

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6203 from SUSE/wip-13413-firefly
Loic Dachary [Tue, 20 Oct 2015 11:08:01 +0000 (13:08 +0200)]
Merge pull request #6203 from SUSE/wip-13413-firefly

fedora21 has junit, not junit4

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5992 from SUSE/wip-13168-firefly
Loic Dachary [Tue, 20 Oct 2015 11:06:14 +0000 (13:06 +0200)]
Merge pull request #5992 from SUSE/wip-13168-firefly

upstart: configuration is too generous on restarts

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5541 from dachary/wip-12418-firefly
Loic Dachary [Tue, 20 Oct 2015 11:04:40 +0000 (13:04 +0200)]
Merge pull request #5541 from dachary/wip-12418-firefly

ceph-disk: sometimes the journal symlink is not created

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5729 from ceph/wip-11455-firefly
Loic Dachary [Tue, 20 Oct 2015 10:36:01 +0000 (12:36 +0200)]
Merge pull request #5729 from ceph/wip-11455-firefly

rgw: init some manifest fields when handling explicit objs

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5730 from ceph/wip-12537-firefly
Loic Dachary [Tue, 20 Oct 2015 10:35:22 +0000 (12:35 +0200)]
Merge pull request #5730 from ceph/wip-12537-firefly

RGW returns requested bucket name raw in "Bucket" response header

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5831 from gnuoy/wip-11140-firefly
Loic Dachary [Tue, 20 Oct 2015 10:34:01 +0000 (12:34 +0200)]
Merge pull request #5831 from gnuoy/wip-11140-firefly

/etc/init.d/radosgw restart does not work correctly

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoCommon/Thread: pthread_attr_destroy(thread_attr) when done with it 6325/head
zqkkqz [Fri, 7 Aug 2015 02:49:45 +0000 (10:49 +0800)]
Common/Thread: pthread_attr_destroy(thread_attr) when done with it
When a thread attributes object is no longer required, it should be destroyed using the
pthread_attr_destroy() function. Destroying a thread attributes object has no effect on threads that were created using that object.

Fixes: #12570
Signed-off-by: zqkqkz zheng.qiankun@h3c.com
(cherry picked from commit 9471bb838a420ef5f439191d87e5388fecccb9e6)

9 years agoThread.cc: remove malloc/free pair
Piotr Dałek [Fri, 17 Jul 2015 10:43:52 +0000 (12:43 +0200)]
Thread.cc: remove malloc/free pair

There's no need for mallocing pthread_attr_t in Thread::try_create(),
it can be located on stack as it is freed in same function. This reduces
pressure put on memory manager.

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
(cherry picked from commit 614ac0f4e375f3dd008c8937d3f89f6005d6e0a0)

9 years agoFix -Wno-format and -Werror=format-security options clash 6207/head
Boris Ranto [Fri, 15 Aug 2014 17:34:27 +0000 (19:34 +0200)]
Fix -Wno-format and -Werror=format-security options clash

This causes build failure in latest fedora builds, ceph_test_librbd_fsx adds -Wno-format cflag but the default AM_CFLAGS already contain -Werror=format-security, in previous releases, this was tolerated but in the latest fedora rawhide it no longer is, ceph_test_librbd_fsx builds fine without -Wno-format on x86_64 so there is likely no need for the flag anymore

Signed-off-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 7df67a544f6401fd31157b6e2a6ca590d87d7cbc)

Conflicts:
src/test/Makefile.am

9 years agoceph.spec.in: junit always except for EPEL 6 6203/head
Loic Dachary [Tue, 3 Feb 2015 15:14:23 +0000 (16:14 +0100)]
ceph.spec.in: junit always except for EPEL 6

The package was renamed a long time ago (around the Fedora 15
timeframe). The "junit4" name is only relevant for EPEL 6. For EPEL 7
and Fedora 20, the "junit" package has "Provides: junit4". And most
recently, in the junit package that ships in Fedora 21 and 22, the
package maintainer dropped the old Provides: line.

http://tracker.ceph.com/issues/10728 Fixes: #10728

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 4f36eaee9ea71ed48018ccb2d7eac3e809c72d82)

9 years agotest/librados/tier.cc: destroy and recreate cache pool on every test 5236/head
Samuel Just [Fri, 8 May 2015 17:26:48 +0000 (10:26 -0700)]
test/librados/tier.cc: destroy and recreate cache pool on every test

Namespaces are not sufficient with the checks for 11493 in the mon.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit bef09e0cdb274cb1c87335a2af9ee532d14a4596)

9 years agomon: prevent pool with snapshot state from being used as a tier
Sage Weil [Wed, 29 Apr 2015 19:34:25 +0000 (12:34 -0700)]
mon: prevent pool with snapshot state from being used as a tier

If we add a pool with snap state as a tier the snap state gets clobbered
by OSDMap::Incremental::propogate_snaps_to_tiers(), and may prevent OSDs
from starting.  Disallow this.

Include a test.

Fixes: #11493
Backport: hammer, giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit bbec53edf9e585af4e20bbc9ba9057d6fdfda342)

Conflicts:
qa/workunits/cephtool/test.sh
           properly co-exist with "# make sure we can't create an ec pool tier"
src/mon/OSDMonitor.cc
           properly co-exist with preceding "if (tp->ec_pool())"
        (The changes to both files would have applied cleanly if
        https://github.com/ceph/ceph/pull/5389 had not been merged first.)

9 years agoMerge pull request #5993 from SUSE/wip-13169-firefly
Loic Dachary [Sat, 3 Oct 2015 07:40:33 +0000 (09:40 +0200)]
Merge pull request #5993 from SUSE/wip-13169-firefly

update docs to point to download.ceph.com

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoceph_test_rados_api_tier: fix cleanup of whiteouts 5050/head
Sage Weil [Fri, 14 Nov 2014 06:33:10 +0000 (22:33 -0800)]
ceph_test_rados_api_tier: fix cleanup of whiteouts

Doing a normal DELETE on a whiteout returns ENOENT.  Use the IGNORE_CACHE
flag to make sure it removes the whiteout, too.

Fixes: #10052
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 8dde6a61921798aa188bd69406c8fa7afeb96b45)

Conflicts:
src/test/librados/TestCase.cc
            for it of type ObjectIterator:
            - use it->first instead of it->get_oid()
            - use it->second instead of it->get_locator()

9 years agoosd/ReplicatedPG: allow whiteout deletion with IGNORE_CACHE flag
Sage Weil [Fri, 14 Nov 2014 06:32:20 +0000 (22:32 -0800)]
osd/ReplicatedPG: allow whiteout deletion with IGNORE_CACHE flag

If the client specifies IGNORE_CACHE, allow a regular DELETE to zap a
whiteout.  Expand test case to verify this works.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 34e4d24)

    Conflicts:
        src/test/librados/tier.cc
            replaced NObjectIterator -> ObjectIterator
            replaced cache_ioctx.nobjects_begin -> cache_ioctx.objects_begin
            replaced cache_ioctx.nobjects_end -> cache_ioctx.objects_end
            replace it->get_oid() with it->first for it of type ObjectIterator

9 years agomon/Elector: do a trivial write on every election cycle 6091/head
Sage Weil [Wed, 23 Sep 2015 14:58:01 +0000 (10:58 -0400)]
mon/Elector: do a trivial write on every election cycle

Currently we already do a small write when the *first* election in
a round happens (to update the election epoch).  If the backend
happens to fail while we are already in the midst of elections,
however, we may continue to call elections without verifying we
are still writeable.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ef909ccbdc303cce8a39edef255325127832ff16)

    Conflicts:
src/mon/Elector.cc
            no MonitorDBStore::TransactionRef in firefly

9 years agomon/MonitorDBStore: assert/crash if there is a write error
Sage Weil [Wed, 23 Sep 2015 14:58:13 +0000 (10:58 -0400)]
mon/MonitorDBStore: assert/crash if there is a write error

Do this globally intead of relying on teh zillion mon callers to
check the error code.  There are no cases where we want to
tolerate a commit failure.

Fixes: #13089
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 2fb7b1f0e33ada7c9a1be3de2f7708eb0760fcef)

9 years agouse simplifed messenger constructor for clients 6087/head
Josh Durgin [Mon, 21 Sep 2015 22:46:42 +0000 (15:46 -0700)]
use simplifed messenger constructor for clients

This is all mechanical except the calculation of the nonce, which is
now always randomized for clients.

Fixes: #13032
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit a3a8c85b79afef67681c32c57b591c0e0a87a349)

Conflicts:
src/ceph_fuse.cc
src/ceph_syn.cc
src/libcephfs.cc
src/librados/RadosClient.cc
src/mds/MDSUtility.cc
src/mon/MonClient.cc
src/test/mon/test_mon_workloadgen.cc
            - different arguments to Messenger::create() in firefly

9 years agolibrados: use Messenger factory method
Sage Weil [Tue, 7 Oct 2014 04:20:08 +0000 (21:20 -0700)]
librados: use Messenger factory method

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5a860bec48348ed4c09256ccd394b33ace6b4f52)

9 years agomon/MonClient: use generic Messenger factory
Sage Weil [Mon, 6 Oct 2014 15:50:48 +0000 (08:50 -0700)]
mon/MonClient: use generic Messenger factory

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e55cb1f68ae1a04cc5d281bea57ee79ef4a8af38)

9 years agomsg: add simplified messenger constructor
Josh Durgin [Mon, 21 Sep 2015 22:20:53 +0000 (15:20 -0700)]
msg: add simplified messenger constructor

Several callers create messengers using exactly the same parameters:

- reading the ms type from cct that is also passed in
- a default entity_name_t::CLIENT
- the default features

Additionally, the nonce should be randomized and not depend on
e.g. pid, as it does in several callers now. Clients running in
containers can easily have pid collisions, leading to hangs, so
randomize the nonce in this simplified constructor rather than
duplicating that logic in every caller.

Daemons have meaningful entity_name_ts, and monitors currently depend
on using 0 as a nonce, so make this simple constructer
client-specific.

Related: #13032
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit e3785b0b5fbff870adbd5f121021b671912386cf)

Conflicts:
src/msg/Messenger.cc
            - different #includes in firefly
            - different Messenger::create() arguments in firefly

9 years agoMerge pull request #6038 from liewegas/wip-13088
Sage Weil [Wed, 23 Sep 2015 21:09:18 +0000 (17:09 -0400)]
Merge pull request #6038 from liewegas/wip-13088

common/HeartBeat: include types

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agocommon/RWLock: include assert 6038/head
Sage Weil [Wed, 23 Sep 2015 21:06:52 +0000 (17:06 -0400)]
common/RWLock: include assert

Fixes atomic_t build issue without libatomic-ops.

Fixes: #13088
Signed-off-by: Sage Weil <sage@redhat.com>
9 years ago.gitmodules: fix ceph-object-corpus source url
Sage Weil [Tue, 22 Sep 2015 17:03:49 +0000 (13:03 -0400)]
.gitmodules: fix ceph-object-corpus source url

Fixes: #13196
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6000 from SUSE/wip-12097-firefly
Sage Weil [Tue, 22 Sep 2015 16:29:08 +0000 (12:29 -0400)]
Merge pull request #6000 from SUSE/wip-12097-firefly

kernel_untar_build fails on EL7

9 years agoMerge pull request #5234 from SUSE/wip-12244-firefly
Yehuda Sadeh [Mon, 21 Sep 2015 20:07:49 +0000 (13:07 -0700)]
Merge pull request #5234 from SUSE/wip-12244-firefly

Civetweb RGW appears to report full size of object as downloaded when only partially downloaded

9 years agoMerge pull request #4535 from xinxinsh/wip-11416-firefly
Yehuda Sadeh [Mon, 21 Sep 2015 19:35:52 +0000 (12:35 -0700)]
Merge pull request #4535 from xinxinsh/wip-11416-firefly

rgw: use correct objv_tracker for bucket instance

9 years agomon: handle case where mon_globalid_prealloc > max_global_id 6010/head
Sage Weil [Mon, 19 Jan 2015 00:49:20 +0000 (16:49 -0800)]
mon: handle case where mon_globalid_prealloc > max_global_id

This triggers with the new larger mon_globalid_prealloc value.  It didn't
trigger on the existing cluster I tested on because it already had a very
large max.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit bbaf582e5bb54ae35327ffd234e4ccf0f07317db)

9 years agomon: change mon_globalid_prealloc to 10000 (from 100)
Sage Weil [Sun, 18 Jan 2015 18:39:25 +0000 (10:39 -0800)]
mon: change mon_globalid_prealloc to 10000 (from 100)

100 ids (session 100 authentications) can be consumed quite quickly if
the monitor is being queried by the CLI via scripts or on a large cluster,
especially if the propose interval is long (many seconds).  These live in
a 64-bit value and are only "lost" if we have a mon election before they
are consumed, so there's no real risk here.

Backport: giant, firefly
Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1d1215fe5f95c2bafee5b670cdae1353104636a0)

9 years agoqa: update to newer Linux tarball 6000/head
Greg Farnum [Tue, 16 Jun 2015 15:13:41 +0000 (08:13 -0700)]
qa: update to newer Linux tarball

This should make newer gcc releases happier in their default configuration.
kernel.org is now distributing tarballs as .xz files so we change to that
as well when decompressing (it is supported by Ubuntu Precise so we should
be all good).

Fixes: #11758
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 1ea3f47ab806d48ca7b045c2731d344eae3900e1)

Conflicts:
qa/workunits/kernel_untar_build.sh
            trivial resolution

9 years agodoc: correct links to download.ceph.com 5993/head
Alfredo Deza [Fri, 18 Sep 2015 18:13:02 +0000 (14:13 -0400)]
doc: correct links to download.ceph.com

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 387d7800359154950431d0984c756f43f21dd9b4)

Conflicts:
doc/install/get-packages.rst
            preferred the new version in all cases

9 years agoupstart: limit respawn to 3 in 30 mins (instead of 5 in 30s) 5992/head
Sage Weil [Wed, 3 Jun 2015 18:57:34 +0000 (14:57 -0400)]
upstart: limit respawn to 3 in 30 mins (instead of 5 in 30s)

It may take tens of seconds to restart each time, so 5 in 30s does not stop
the crash on startup respawn loop in many cases.  In particular, we'd like
to catch the case where the internal heartbeats fail.

This should be enough for all but the most sluggish of OSDs and capture
many cases of failure shortly after startup.

Fixes: #11798
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit eaff6cb24ef052c54dfa2131811758e335f19939)

9 years agoWorkQueue: add/remove_work_queue methods now thread safe 5991/head
Jason Dillaman [Mon, 10 Aug 2015 23:10:19 +0000 (19:10 -0400)]
WorkQueue: add/remove_work_queue methods now thread safe

These methods were not acquiring the ThreadPool lock when
manipulating the work_queue collection.  This was causing
occasional crashes within librbd when opening and closing
images.

Fixes: #12662
Backport: hammer, firefly
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3e18449b01c1ab78d1bbfc1cf111aa9bdbef7b1f)

9 years agoPG::handle_advance_map: on_pool_change after handling the map change 5988/head
Samuel Just [Thu, 27 Aug 2015 18:08:33 +0000 (11:08 -0700)]
PG::handle_advance_map: on_pool_change after handling the map change

Otherwise, the is_active() checks in the hitset code can erroneously
return true firing off repops stamped with the new epoch which then get
cleared in the map change code.  The filestore callbacks then pass the
interval check and call into a destroyed repop structure.

Fixes: 12809
Backport: hammer,firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 14e02bc90a463805f4c3e2de210892067a52514b)

9 years agoMerge pull request #5200 from SUSE/wip-12289-firefly 5935/head
Nathan Cutler [Thu, 10 Sep 2015 09:46:41 +0000 (11:46 +0200)]
Merge pull request #5200 from SUSE/wip-12289-firefly

mon: scrub error (osdmap encoding mismatch?) upgrading from 0.80 to ~0.80.2

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agomon: MonitorDBStore: make get_next_key() work properly 5360/head
Joao Eduardo Luis [Mon, 7 Sep 2015 13:12:19 +0000 (14:12 +0100)]
mon: MonitorDBStore: make get_next_key() work properly

We introduced a significant bug with 2cc7aee, when we fixed issue #11786.
Although that patch would fix the problem described in #11786, we
managed to not increment the iterator upon returning the current key.
This would have the iterator iterating over the same key, forever and
ever.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit 70d31082fd3dc8c7857994104577f1a3631c678c)

9 years agoMerge pull request #5388 from SUSE/wip-12490-firefly
Nathan Cutler [Wed, 9 Sep 2015 13:45:37 +0000 (15:45 +0200)]
Merge pull request #5388 from SUSE/wip-12490-firefly

buffer: critical bufferlist::zero bug

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #5408 from SUSE/wip-12492-firefly
Nathan Cutler [Wed, 9 Sep 2015 04:10:09 +0000 (06:10 +0200)]
Merge pull request #5408 from SUSE/wip-12492-firefly

the output is wrong when runing ceph osd reweight

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5404 from SUSE/wip-12395-firefly
Nathan Cutler [Wed, 9 Sep 2015 04:07:51 +0000 (06:07 +0200)]
Merge pull request #5404 from SUSE/wip-12395-firefly

register_new_pgs() should check ruleno instead of its index

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5199 from SUSE/wip-11980-firefly
Nathan Cutler [Wed, 9 Sep 2015 04:05:39 +0000 (06:05 +0200)]
Merge pull request #5199 from SUSE/wip-11980-firefly

MDSMonitor: handle MDSBeacon messages properly

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5410 from SUSE/wip-12497-firefly
Nathan Cutler [Wed, 9 Sep 2015 04:04:15 +0000 (06:04 +0200)]
Merge pull request #5410 from SUSE/wip-12497-firefly

get pools health'info have error

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5409 from SUSE/wip-12495-firefly
Nathan Cutler [Wed, 9 Sep 2015 04:01:50 +0000 (06:01 +0200)]
Merge pull request #5409 from SUSE/wip-12495-firefly

pgmonitor: wrong at/near target max“ reporting

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5358 from ceph/wip-11470.firefly
Nathan Cutler [Mon, 7 Sep 2015 12:22:52 +0000 (14:22 +0200)]
Merge pull request #5358 from ceph/wip-11470.firefly

mon: PaxosService: call post_refresh() instead of post_paxos_update()

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agorgw: init script waits until the radosgw stops 5831/head
Dmitry Yatsushkevich [Tue, 17 Mar 2015 22:44:52 +0000 (15:44 -0700)]
rgw: init script waits until the radosgw stops

Fixes: #11140
Init script waits in stop action until the radowgw daemons stop.

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
(cherry picked from commit 1cca0c1e91a1e18f82f4d22855e96b2fc947f5ea)

9 years agoMerge pull request #5403 from SUSE/wip-12393-firefly
Nathan Cutler [Mon, 7 Sep 2015 08:20:27 +0000 (10:20 +0200)]
Merge pull request #5403 from SUSE/wip-12393-firefly

Memory leak in Mutex.cc, pthread_mutexattr_init without pthread_mutexattr_destroy

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #5225 from SUSE/wip-12266-firefly
Nathan Cutler [Sun, 6 Sep 2015 19:19:55 +0000 (21:19 +0200)]
Merge pull request #5225 from SUSE/wip-12266-firefly

ceph.spec.in: 50-rbd.rules conditional is wrong

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5217 from SUSE/wip-12268-firefly
Nathan Cutler [Sun, 6 Sep 2015 19:19:42 +0000 (21:19 +0200)]
Merge pull request #5217 from SUSE/wip-12268-firefly

ceph-common needs python-argparse on older distros, but doesn't require it

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoWBThrottle::clear_object: signal if we cleared an object 5822/head
Samuel Just [Tue, 7 Jul 2015 15:49:54 +0000 (08:49 -0700)]
WBThrottle::clear_object: signal if we cleared an object

Fixes: #12223
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 8447b08d60d5cf7dce20f8b839cc2cb5a93782de)

9 years agoosd/PGLog: dirty_to is inclusive 5820/head
Sage Weil [Sun, 9 Aug 2015 14:46:10 +0000 (10:46 -0400)]
osd/PGLog: dirty_to is inclusive

There are only two callers of mark_dirty_to who do not pass max,
and they are both in the merge_log extending tail path.  In that
case, we want to include the last version specified in the log
writeout.  Fix the tail extending code to always specify the
last entry added, inclusive.

Fixes: #12652
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit f0ca14df0641daa04eee39d98d8bd0faf46e4e6d)

9 years agoMerge pull request #5224 from SUSE/wip-12304-firefly
Ken Dreyer [Fri, 4 Sep 2015 17:50:22 +0000 (11:50 -0600)]
Merge pull request #5224 from SUSE/wip-12304-firefly

ceph.spec.in running fdupes unnecessarily

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #5394 from SUSE/wip-12447-firefly
Ken Dreyer [Fri, 4 Sep 2015 17:47:49 +0000 (11:47 -0600)]
Merge pull request #5394 from SUSE/wip-12447-firefly

ceph.spec.in: useless %py_requires breaks SLE11-SP3 build

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoconfig: skip lockdep for intentionally recursive md_config_t lock 5814/head
Josh Durgin [Mon, 24 Aug 2015 22:40:39 +0000 (15:40 -0700)]
config: skip lockdep for intentionally recursive md_config_t lock

lockdep can't handle recursive locks, resulting in false positive
reports for certain set_val_or_die() calls, like via
md_config_t::parse_argv() passed "-m".

Fixes: #12614
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit 415226995ebe841cc9e8639a3233150a75aecaed)

9 years agoMerge pull request #5043 from SUSE/wip-12007-firefly
Loic Dachary [Fri, 4 Sep 2015 15:18:30 +0000 (17:18 +0200)]
Merge pull request #5043 from SUSE/wip-12007-firefly

Objecter: pg listing can deadlock when throttling is in use

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: tiering agent and proxy read 5813/head
Loic Dachary [Thu, 13 Aug 2015 17:41:47 +0000 (19:41 +0200)]
tests: tiering agent and proxy read

Verify that an object promoted to a cache tier because of a proxy read
is evicted as expected.

http://tracker.ceph.com/issues/12673 Refs: #12673

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 7924231930732bd297d3bd034c8295e96cb81088)

Conflicts:
qa/workunits/cephtool/test.sh
            resolved by manually adding the new test to TESTS

9 years agoosd: trigger the cache agent after a promotion
Loic Dachary [Thu, 13 Aug 2015 11:47:24 +0000 (13:47 +0200)]
osd: trigger the cache agent after a promotion

When a proxy read happens, the object promotion is done in parallel. The
agent_choose_mode function must be called to reconsider the situation
to protect against the following scenario:

  * proxy read
  * agent_choose_mode finds no object exists and the agent
    goes idle
  * object promotion happens
  * the agent does not reconsider and eviction does not happen
    although it should

http://tracker.ceph.com/issues/12673 Fixes: #12673

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit e1f58feb9b1d20b72f2eb2eefdea5982e0cddccd)

9 years agoMerge pull request #4769 from SUSE/wip-11741-firefly
Loic Dachary [Fri, 4 Sep 2015 15:08:41 +0000 (17:08 +0200)]
Merge pull request #4769 from SUSE/wip-11741-firefly

crush: take crashes due to invalid arg

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #4788 from SUSE/wip-11801-firefly
Nathan Cutler [Fri, 4 Sep 2015 14:50:45 +0000 (16:50 +0200)]
Merge pull request #4788 from SUSE/wip-11801-firefly

Make it more difficult to delete pools in firefly

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5235 from SUSE/wip-12310-firefly
Loic Dachary [Fri, 4 Sep 2015 14:44:57 +0000 (16:44 +0200)]
Merge pull request #5235 from SUSE/wip-12310-firefly

read on chunk-aligned xattr not handled

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5389 from SUSE/wip-12391-firefly
Loic Dachary [Fri, 4 Sep 2015 14:42:28 +0000 (16:42 +0200)]
Merge pull request #5389 from SUSE/wip-12391-firefly

EC pools are not allowed as cache pools, disallow in the mon

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5406 from ceph/wip-12465-firefly
Sage Weil [Fri, 4 Sep 2015 13:42:03 +0000 (09:42 -0400)]
Merge pull request #5406 from ceph/wip-12465-firefly

log: take mutex while opening fd

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #4854 from ceph/wip-11769-firefly
Nathan Cutler [Thu, 3 Sep 2015 10:34:32 +0000 (12:34 +0200)]
Merge pull request #4854 from ceph/wip-11769-firefly

librbd: aio calls may block

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5233 from SUSE/wip-12074-firefly
Loic Dachary [Wed, 2 Sep 2015 05:55:15 +0000 (07:55 +0200)]
Merge pull request #5233 from SUSE/wip-12074-firefly

RGW logfile does not get chowned properly

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agorgw: init some manifest fields when handling explicit objs 5729/head
Yehuda Sadeh [Wed, 26 Aug 2015 21:34:30 +0000 (14:34 -0700)]
rgw: init some manifest fields when handling explicit objs

Fixes: #11455
When dealing with old manifest that has explicit objs, we also
need to set the head size and head object correctly so that
code that relies on this info doesn't break.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit d7bf8cb594e5276d1c80544f5ec954d52b159750)

9 years agorgw: url encode exposed bucket 5730/head
Yehuda Sadeh [Thu, 30 Jul 2015 21:47:15 +0000 (14:47 -0700)]
rgw: url encode exposed bucket

Fixes: #12537
Don't send the bucket name back without url encoding it.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit ad5507fe0bf72ed5bdf8353e315cc9092c740144)

9 years agorgw: Do not enclose the Bucket header in quotes
Wido den Hollander [Wed, 3 Jun 2015 11:13:33 +0000 (13:13 +0200)]
rgw: Do not enclose the Bucket header in quotes

Fixes: #11860
Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit 8af25faed93fe02d3dad585b8579ce8b041cc4e6)

9 years agoObjecter: pg_interval_t::is_new_interval needs pgid from previous pool 5726/head
Jason Dillaman [Fri, 21 Aug 2015 15:32:39 +0000 (11:32 -0400)]
Objecter: pg_interval_t::is_new_interval needs pgid from previous pool

When increasing the pg_num of a pool, an assert would fail since the
calculated pgid seed would be for the pool's new pg_num value instead
of the previous pg_num value.

Fixes: #10399
Backport: infernalis, hammer, firefly
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f20f7a23e913d09cc7fc22fb3df07f9938ddc144)

Conflicts: (hobject_t sort order not backported, trivial resolution)
src/osdc/Objecter.cc
src/osdc/Objecter.h

9 years agoosd_types::is_new_interval: size change triggers new interval
Samuel Just [Tue, 26 May 2015 19:35:11 +0000 (12:35 -0700)]
osd_types::is_new_interval: size change triggers new interval

Fixes: 11771
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit ff79959c037a7145f7104b06d9e6a64492fdb95f)

9 years agomon: add a cache layer over MonitorDBStore 5698/head
Kefu Chai [Mon, 10 Aug 2015 11:25:03 +0000 (04:25 -0700)]
mon: add a cache layer over MonitorDBStore

the cache of of leveldb does not perform well under some condition,
so we need a cache in our own stack.

* add an option "mon_osd_cache_size" to control the size of cache size
  of MonitorDBStore.

Fixes: #12638
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5e99a578050976ca22b549812ac80d494fe7041d)

Conflicts:
src/mon/OSDMonitor.h
minor differences in OSDMonitor ctor

9 years agoos/FileJournal: Fix journal write fail, align for direct io 5619/head
Sage Weil [Thu, 15 Jan 2015 19:20:18 +0000 (11:20 -0800)]
os/FileJournal: Fix journal write fail, align for direct io

when config journal_zero_on_create true, osd mkfs will fail when zeroing journal.
journal open with O_DIRECT, buf should align with blocksize.

Backport: giant, firefly, dumpling
Signed-off-by: Xie Rui <875016668@qq.com>
Reviewed-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 80473f63853593e53d72f17c098152caf17f5e9e)

9 years agoMerge pull request #5390 from SUSE/wip-12503-firefly
Nathan Cutler [Wed, 12 Aug 2015 07:43:19 +0000 (09:43 +0200)]
Merge pull request #5390 from SUSE/wip-12503-firefly

rgw/logrotate.conf calls service with wrong init script name

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #4765 from SUSE/wip-11721-firefly
Yehuda Sadeh [Tue, 11 Aug 2015 18:27:16 +0000 (11:27 -0700)]
Merge pull request #4765 from SUSE/wip-11721-firefly

rgw: Keystone PKI token expiration is not enforced

9 years agoceph-disk: don't change the journal partition uuid 5541/head
Dan van der Ster [Tue, 18 Nov 2014 14:51:46 +0000 (15:51 +0100)]
ceph-disk: don't change the journal partition uuid

We observe that the new /dev/disk/by-partuuid/<journal_uuid>
symlink is not always created by udev when reusing a journal
partition. Fix by not changing the uuid of a journal partition
in this case -- instead we can reuse the existing uuid (and
journal_symlink) instead. We also now assert that the symlink
exists before further preparing the OSD.

Fixes: #10146
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Tested-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 29eb1350b4acaeabfe1d2b19efedbce22641d8cc)

9 years agoceph-disk: set guid if reusing a journal partition
Dan van der Ster [Mon, 29 Sep 2014 11:20:10 +0000 (13:20 +0200)]
ceph-disk: set guid if reusing a journal partition

When reusing a journal partition (e.g. /dev/sda2) we should set a
new partition guid and link it correctly with the OSD. This way
the journal is symlinked by its persistent name and ceph-disk list
works correctly.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit beff616f506b96eb52285f0d2e268e10f8edaa2c)

9 years agoUpdate OSDMonitor.cc 5410/head
renhwztetecs [Tue, 21 Jul 2015 10:55:00 +0000 (18:55 +0800)]
Update OSDMonitor.cc

OSDMonitor::get_pools_health(), s/objects/bytes/

Fixes: #12402
Signed-off-by: ren.huanwen@zte.com.cn
(cherry picked from commit 7fc13c9d6b9a4962d7640240416105d8f558d600)

9 years ago mon/PGMonitor: avoid uint64_t overflow when checking pool 'target/max' status. 5409/head
huangjun [Mon, 20 Jul 2015 02:50:20 +0000 (10:50 +0800)]
  mon/PGMonitor: avoid uint64_t overflow when checking pool 'target/max' status.
Fixes: #12401
Signed-off-by: huangjun <hjwsm1989@gmail.com>
(cherry picked from commit f84e6b8157e78fd05cd1c8ac957c92df17e6ba06)

9 years agomon: OSDMonitor: fix hex output on 'osd reweight' 5408/head
Joao Eduardo Luis [Tue, 21 Jul 2015 10:20:53 +0000 (11:20 +0100)]
mon: OSDMonitor: fix hex output on 'osd reweight'

Fixes: #12251
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit 787fa80c2746fde44ac0583ff7995ec5be9a672d)

9 years agomon/PGMonitor: bug fix pg monitor get crush rule 5404/head
Xinze Chi [Fri, 3 Jul 2015 10:27:13 +0000 (18:27 +0800)]
mon/PGMonitor: bug fix pg monitor get crush rule

when some rules have been deleted before, the index in array of crush->rules
is not always equals to crush_ruleset of pool.

Fixes: #12210
Reported-by: Ning Yao <zay11022@gmail.com>
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit 498793393c81c0a8e37911237969fba495a3a183)

9 years agoMutex: fix leak of pthread_mutexattr 5403/head
Ketor Meng [Tue, 26 May 2015 10:50:17 +0000 (18:50 +0800)]
Mutex: fix leak of pthread_mutexattr

Need pthread_mutexattr_destroy after pthread_mutexattr_init

Fixes: #111762
Signed-off-by: Ketor Meng <d.ketor@gmail.com>
(cherry picked from commit 2b23327b3aa8d96341d501a5555195ca1bc0de8f)

9 years agoceph.spec.in: drop SUSE-specific %py_requires macro 5394/head
Nathan Cutler [Thu, 9 Jul 2015 09:51:13 +0000 (11:51 +0200)]
ceph.spec.in: drop SUSE-specific %py_requires macro

%py_requires expands to

BuildRequires: /usr/bin/python
PreReq: python = 2.7

The BuildRequires: is already provided, and the PreReq is wrong because
e.g. SLE11-SP3 (a platform we are trying to support) has Python 2.6.

http://tracker.ceph.com/issues/12351 Fixes: #12351

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit cbf6c7b46b42e163950bf7956e5b7565fca961c9)

Conflicts:
ceph.spec.in
            in master, the %py_requires is in the python-rados package,
            while in firefly it is in the python-ceph package

9 years agorgw/logrotate.conf: Rename service name 5390/head
wuxingyi [Wed, 11 Mar 2015 09:34:40 +0000 (17:34 +0800)]
rgw/logrotate.conf: Rename service name

The service name for ceph rados gateway was changed to "ceph-radosgw",
the previous version of service name "radosgw" would cause a failed reload,
and finally make it impossible to write any log data to the log file.

Signed-off-by: wuxingyi <wuxingyi2015@outlook.com>
(cherry picked from commit 9df3f798179481fe8ae6ae873dcb793de7d8f367)

9 years agoOSDMonitor: disallow ec pools as tiers 5389/head
Samuel Just [Fri, 15 May 2015 20:05:40 +0000 (13:05 -0700)]
OSDMonitor: disallow ec pools as tiers

Fixes: 11650
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 11b7801bb57cb25cd2d26d58722d49691747725b)

Conflicts:
qa/workunits/cephtool/test.sh
           no "# make sure we can't clobber snapshot state" tests in firefly
src/mon/OSDMonitor.cc
           no tp->removed_snaps.empty() in firefly

9 years agoUnittestBuffer: Add bufferlist zero test case 5388/head
Haomai Wang [Thu, 9 Jul 2015 05:32:03 +0000 (13:32 +0800)]
UnittestBuffer: Add bufferlist zero test case

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit 577acf665948e531e50d36f5780ea19351a5bf65)

9 years agobuffer: Fix bufferlist::zero bug with special case
Haomai Wang [Thu, 9 Jul 2015 05:42:42 +0000 (13:42 +0800)]
buffer: Fix bufferlist::zero bug with special case

Fixes: #12252
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit 43f583d160ccaf879eaf0f3020e77860cf8d1df0)