]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agorgw: make radosgw-admin user rm idempotent 5918/head
Orit Wasserman [Thu, 27 Aug 2015 14:35:25 +0000 (16:35 +0200)]
rgw: make radosgw-admin user rm idempotent

Fixes: #5378
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #5901 from yuyuyu101/wip-13001
Sage Weil [Sun, 13 Sep 2015 13:12:39 +0000 (09:12 -0400)]
Merge pull request #5901 from yuyuyu101/wip-13001

AsyncMessenger: Kepp file_lock hold when accessing its event field

9 years agoMerge pull request #5626 from majianpeng/objecter
Sage Weil [Sun, 13 Sep 2015 13:12:25 +0000 (09:12 -0400)]
Merge pull request #5626 from majianpeng/objecter

Objecter: fix bus about objecter.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5840 from liewegas/wip-12991
Sage Weil [Sun, 13 Sep 2015 13:08:57 +0000 (09:08 -0400)]
Merge pull request #5840 from liewegas/wip-12991

qa/workunits/cephtool/test.sh: make mds epoch check more tolerant

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge remote-tracking branch 'gh/infernalis'
Sage Weil [Sun, 13 Sep 2015 11:45:30 +0000 (07:45 -0400)]
Merge remote-tracking branch 'gh/infernalis'

9 years agoMerge pull request #5686 from liewegas/wip-hammer-feature
Sage Weil [Sun, 13 Sep 2015 11:41:56 +0000 (07:41 -0400)]
Merge pull request #5686 from liewegas/wip-hammer-feature

require osds are hammer v0.94.4 or later before upgrading past hammer

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5905 from ceph/wip-rpm-notcmalloc
Sage Weil [Sun, 13 Sep 2015 00:44:05 +0000 (20:44 -0400)]
Merge pull request #5905 from ceph/wip-rpm-notcmalloc

ceph.spec: respect CEPH_EXTRA_CONFIGURE_ARGS

9 years agoMerge pull request #5904 from ceph/wip-submodules
Sage Weil [Sun, 13 Sep 2015 00:43:48 +0000 (20:43 -0400)]
Merge pull request #5904 from ceph/wip-submodules

fix a few submodule issues

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years ago.gitignore: ignore src/ceph.tmpe 5904/head
Sage Weil [Sat, 12 Sep 2015 21:43:52 +0000 (17:43 -0400)]
.gitignore: ignore src/ceph.tmpe

It makes the gitbuilders unhappy.  Not sure where it comes from...

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agogmock: ignore *.pyc
Sage Weil [Sat, 12 Sep 2015 18:21:32 +0000 (14:21 -0400)]
gmock: ignore *.pyc

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agorocksdb: ignore m4
Sage Weil [Sat, 12 Sep 2015 18:17:01 +0000 (14:17 -0400)]
rocksdb: ignore m4

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph.spec: respect CEPH_EXTRA_CONFIGURE_ARGS 5905/head
Sage Weil [Sat, 12 Sep 2015 18:12:20 +0000 (14:12 -0400)]
ceph.spec: respect CEPH_EXTRA_CONFIGURE_ARGS

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoqa/workunits/cephtool/test.sh: make mds epoch check more tolerant 5840/head
Sage Weil [Sat, 12 Sep 2015 17:51:13 +0000 (13:51 -0400)]
qa/workunits/cephtool/test.sh: make mds epoch check more tolerant

This can race with an actual mdsmap epoch update for some other
reason.  We just need to make sure the epoch *increased*, not that
it is exactly old + 1.

Fixes: #12991
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge remote-tracking branch 'gh/wip-10617-again'
Sage Weil [Sat, 12 Sep 2015 17:45:09 +0000 (13:45 -0400)]
Merge remote-tracking branch 'gh/wip-10617-again'

9 years agoMerge pull request #5334 from majianpeng/read-len-zero-for-ec
Kefu Chai [Sat, 12 Sep 2015 16:05:27 +0000 (00:05 +0800)]
Merge pull request #5334 from majianpeng/read-len-zero-for-ec

make read ec-object(offset=0, len=0) can work like read no-ec object.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agosd/PG: tolerate missing pgmeta object
Sage Weil [Fri, 11 Sep 2015 14:16:23 +0000 (10:16 -0400)]
sd/PG: tolerate missing pgmeta object

Bug 10617 left stray PG dirs around in firefly.  Hammer correctly
ignores these, assuming they are leftover cruft.  We broke this
when we dropped compat support in cd4e676e6d45c8166290ef834d73c2a0bda98fa2

See also #13060.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: allow peek_map_epoch to return an error
Sage Weil [Fri, 11 Sep 2015 14:15:07 +0000 (10:15 -0400)]
osd: allow peek_map_epoch to return an error

Allow PG::peek_map_epoch to return an error indicating the PG
should be skipped.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5776 from wonzhq/tmap-update
Sage Weil [Sat, 12 Sep 2015 13:19:20 +0000 (09:19 -0400)]
Merge pull request #5776 from wonzhq/tmap-update

osd: force promote for ops which ec base pool can't handle

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoosd/ReplicatedPG: remove stray debug line
Sage Weil [Sat, 12 Sep 2015 12:33:44 +0000 (08:33 -0400)]
osd/ReplicatedPG: remove stray debug line

This snuck in

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoAsyncMessenger: Kepp file_lock hold when accessing its event field 5901/head
Haomai Wang [Sat, 12 Sep 2015 09:31:10 +0000 (17:31 +0800)]
AsyncMessenger: Kepp file_lock hold when accessing its event field

When process_event get a file event, other thread may delete this event later
but before we do event

Fix #13001
Signed-off-by: Haomai Wang <haomai@xsky.io>
9 years agoMerge pull request #5896 from liewegas/wip-fix-spec
Sage Weil [Fri, 11 Sep 2015 17:02:29 +0000 (13:02 -0400)]
Merge pull request #5896 from liewegas/wip-fix-spec

ceph.spec: include /etc/sysconfig/ceph

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoceph.spec: include /etc/sysconfig/ceph 5896/head
Sage Weil [Fri, 11 Sep 2015 16:19:59 +0000 (12:19 -0400)]
ceph.spec: include /etc/sysconfig/ceph

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5895 from jcsp/wip-doc-default-pools
Sage Weil [Fri, 11 Sep 2015 15:56:29 +0000 (11:56 -0400)]
Merge pull request #5895 from jcsp/wip-doc-default-pools

doc: remove references to default data/metadata pools

9 years agodoc: remove references to default data/metadata pools 5895/head
John Spray [Fri, 11 Sep 2015 15:46:52 +0000 (16:46 +0100)]
doc: remove references to default data/metadata pools

These haven't existed since 0.84 -- the cephfs documentation
was updated at the time, but there were also references in the
rados documentation.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #5803 from ceph/wip-debian-systemd
Sage Weil [Fri, 11 Sep 2015 15:42:36 +0000 (11:42 -0400)]
Merge pull request #5803 from ceph/wip-debian-systemd

debian systemd support; /etc/{sysconfig,default}/ceph; easy jemalloc enablement

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoceph-common: explicitly trigger /run/ceph creation 5803/head
Sage Weil [Tue, 8 Sep 2015 17:50:52 +0000 (13:50 -0400)]
ceph-common: explicitly trigger /run/ceph creation

This doesn't happen magically on debian.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agosystemd: tmpfiles.d in /run, not /var/run
Sage Weil [Tue, 8 Sep 2015 17:50:31 +0000 (13:50 -0400)]
systemd: tmpfiles.d in /run, not /var/run

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodebian: fix location of tmpfiles.d
Sage Weil [Sun, 6 Sep 2015 18:18:16 +0000 (14:18 -0400)]
debian: fix location of tmpfiles.d

/usr/lib/tmpfiles.d, not /lib/tmpfiles.d

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodebian/rules: install systemd files and /etc/default/ceph
Sage Weil [Sat, 5 Sep 2015 13:14:15 +0000 (09:14 -0400)]
debian/rules: install systemd files and /etc/default/ceph

Fix the systemd units to use /etc/default instead of /etc/sysconfig.  There
is probably a better way...

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMakefile.am: include etc in tarball
Sage Weil [Fri, 4 Sep 2015 17:49:09 +0000 (13:49 -0400)]
Makefile.am: include etc in tarball

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph.spec: install /etc/sysconfig/ceph
Sage Weil [Fri, 4 Sep 2015 02:21:38 +0000 (22:21 -0400)]
ceph.spec: install /etc/sysconfig/ceph

Make it easy to enable jemalloc, too.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5869 from ceph/wip-rpm-dirs
Sage Weil [Fri, 11 Sep 2015 15:36:25 +0000 (11:36 -0400)]
Merge pull request #5869 from ceph/wip-rpm-dirs

ceph.spec: make /var/{lib,log,run} owned by ceph

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #5540 from ceph/wip-selinux-radosgw
Sage Weil [Fri, 11 Sep 2015 15:31:36 +0000 (11:31 -0400)]
Merge pull request #5540 from ceph/wip-selinux-radosgw

selinux: Update policy for radosgw

Reviewed-by: Milan Broz <mbroz@redhat.com>
9 years agomake /var/run/ceph 770 ceph:ceph 5869/head
Sage Weil [Fri, 11 Sep 2015 15:26:59 +0000 (11:26 -0400)]
make /var/run/ceph 770 ceph:ceph

This allows members of the ceph group to make librados clients (like the
ceph cli and qemu) create sockets in the default /var/run/ceph/* location.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph.spec: make /var/{lib,log,run} owned by ceph
Sage Weil [Fri, 11 Sep 2015 15:24:18 +0000 (11:24 -0400)]
ceph.spec: make /var/{lib,log,run} owned by ceph

Move creation of /var/lib/ceph and /var/run/ceph to ceph-common, too.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5871 from liewegas/wip-10328
Sage Weil [Fri, 11 Sep 2015 13:35:50 +0000 (09:35 -0400)]
Merge pull request #5871 from liewegas/wip-10328

common: add debug option to deliberately leak some memory

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge remote-tracking branch 'gh/wip-tcmalloc'
Sage Weil [Fri, 11 Sep 2015 13:30:17 +0000 (09:30 -0400)]
Merge remote-tracking branch 'gh/wip-tcmalloc'

9 years ago.gitignore: radosgw-object-expirer
Sage Weil [Fri, 11 Sep 2015 13:30:15 +0000 (09:30 -0400)]
.gitignore: radosgw-object-expirer

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5881 from cernceph/wip-logrotate
Sage Weil [Fri, 11 Sep 2015 13:24:17 +0000 (09:24 -0400)]
Merge pull request #5881 from cernceph/wip-logrotate

logrotate: ignore exit status 1 from killall

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoceph.spec.in: ceph-radosgw should require ceph-selinux 5540/head
Boris Ranto [Fri, 4 Sep 2015 07:30:29 +0000 (09:30 +0200)]
ceph.spec.in: ceph-radosgw should require ceph-selinux

Signed-off-by: Boris Ranto <branto@redhat.com>
9 years agoselinux: Update policy for radosgw
Boris Ranto [Mon, 10 Aug 2015 15:07:32 +0000 (17:07 +0200)]
selinux: Update policy for radosgw

The current SELinux policy does not cover radosgw daemon. This patch
introduces the SELinux support for radosgw daemon (civetweb only).

Signed-off-by: Boris Ranto <branto@redhat.com>
9 years agologrotate: ignore postrotate error for radosgw 5881/head
Dan van der Ster [Fri, 11 Sep 2015 07:42:50 +0000 (09:42 +0200)]
logrotate: ignore postrotate error for radosgw

Fix the annoying logrotate error for radosgw.

Fixes: #13033
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
9 years agologrotate: ignore exit status 1 from killall
Dan van der Ster [Fri, 11 Sep 2015 07:30:04 +0000 (09:30 +0200)]
logrotate: ignore exit status 1 from killall

If any of ceph-osd, ceph-mon, ceph-mds were not running then
killall -q will exit status 1, leading to anacron sending a mail

  error: error running shared postrotate script for '/var/log/ceph/*.log '

Fix by overriding the exit status with || true.

Fixes: #13033
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
9 years agoMerge pull request #5800 from ceph/wip-user
Sage Weil [Thu, 10 Sep 2015 22:48:53 +0000 (18:48 -0400)]
Merge pull request #5800 from ceph/wip-user

ceph-disk: do async startup on upstart; fix dmcrypt create/activate bug

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agorocksdb: recognized --without-tcmalloc
Sage Weil [Thu, 10 Sep 2015 21:03:03 +0000 (17:03 -0400)]
rocksdb: recognized --without-tcmalloc

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5031 from trociny/wip-10098
David Zafman [Thu, 10 Sep 2015 20:42:09 +0000 (13:42 -0700)]
Merge pull request #5031 from trociny/wip-10098

ceph-objectstore-tool: add mark-complete operation

Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #5866 from jmunhoz/wip-requestid-on-error
Yehuda Sadeh [Thu, 10 Sep 2015 20:14:40 +0000 (13:14 -0700)]
Merge pull request #5866 from jmunhoz/wip-requestid-on-error

rgw: include RequestId as part of the Error response

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5859 from jecluis/wip-test-mon-ping
Joao Eduardo Luis [Thu, 10 Sep 2015 19:04:41 +0000 (20:04 +0100)]
Merge pull request #5859 from jecluis/wip-test-mon-ping

test: mon/mon-ping.sh: make sure 'ceph mon ping' works as expected

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5873 from dillaman/wip-rbd-missing-return
Josh Durgin [Thu, 10 Sep 2015 17:45:37 +0000 (13:45 -0400)]
Merge pull request #5873 from dillaman/wip-rbd-missing-return

rbd: missing return statement within do_metadata_remove

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agorbd: missing return statement within do_metadata_remove 5873/head
Jason Dillaman [Thu, 10 Sep 2015 16:21:57 +0000 (12:21 -0400)]
rbd: missing return statement within do_metadata_remove

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #5780 from dzafman/wip-12387
Sage Weil [Thu, 10 Sep 2015 14:56:45 +0000 (10:56 -0400)]
Merge pull request #5780 from dzafman/wip-12387

osd: When generating past intervals due to an import end at pg epoch

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agocommon: add debug option to deliberately leak some memory 5871/head
Sage Weil [Thu, 10 Sep 2015 14:35:11 +0000 (10:35 -0400)]
common: add debug option to deliberately leak some memory

This will be used to verify leak detection tests are working.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agotest/Makefile-client: ship LibradosTestStub.h in tarball
Sage Weil [Thu, 10 Sep 2015 11:51:52 +0000 (07:51 -0400)]
test/Makefile-client: ship LibradosTestStub.h in tarball

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5868 from jmunhoz/wip-x-amz-request-id-doc
Loic Dachary [Thu, 10 Sep 2015 10:50:34 +0000 (12:50 +0200)]
Merge pull request #5868 from jmunhoz/wip-x-amz-request-id-doc

doc: rgw: update x-amz-request-id status

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
9 years agoMerge pull request #5863 from ceph/wip-13015
Orit Wasserman [Thu, 10 Sep 2015 10:16:03 +0000 (12:16 +0200)]
Merge pull request #5863 from ceph/wip-13015

rgw: preserve all attrs if intra-zone copy

9 years agodoc: rgw: update x-amz-request-id status 5868/head
Javier M. Mellid [Wed, 9 Sep 2015 20:07:23 +0000 (22:07 +0200)]
doc: rgw: update x-amz-request-id status

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
9 years agorgw: include RequestId as part of the Error response 5866/head
Javier M. Mellid [Wed, 9 Sep 2015 13:56:04 +0000 (15:56 +0200)]
rgw: include RequestId as part of the Error response

The RGW error responses must contain a RequestId to be compliant with
the Amazon S3 errors. This RequestId is the ID of the request associated
with the error.

Fixes: #13020
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
9 years agotest: mon/mon-ping.sh: make sure 'ceph mon ping' works as expected 5859/head
Joao Eduardo Luis [Wed, 9 Sep 2015 19:08:38 +0000 (20:08 +0100)]
test: mon/mon-ping.sh: make sure 'ceph mon ping' works as expected

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #5343 from hjwsm1989/wip-12442
Joao Eduardo Luis [Thu, 10 Sep 2015 08:46:58 +0000 (09:46 +0100)]
Merge pull request #5343 from hjwsm1989/wip-12442

  mon/MonClient: fix error in 'ceph ping mon.id'

Reviewed-by: Joao Eduardo Luis <joao@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoceph-objectstore-tool: add mark-complete operation 5031/head
Mykola Golub [Tue, 16 Jun 2015 08:57:08 +0000 (11:57 +0300)]
ceph-objectstore-tool: add mark-complete operation

It is supposed to be used as a last resort to fix a cluster that has
PGs in 'incomplete' state, using the following procedure:

1) stop the osd that is primary for the incomplete PG;
2) run:
  ceph-objectstore-tool --data-path ... --journal-path ... --pgid $PGID --op mark-complete
3) start the osd.

Fixes: #10098
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #5816 from dillaman/wip-librbd-gmock
Josh Durgin [Thu, 10 Sep 2015 05:47:07 +0000 (01:47 -0400)]
Merge pull request #5816 from dillaman/wip-librbd-gmock

Initial support for gmock-based unit tests in librbd

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5557 from guangyy/wip-12666
Sage Weil [Thu, 10 Sep 2015 02:16:09 +0000 (22:16 -0400)]
Merge pull request #5557 from guangyy/wip-12666

rgw: expose the number of unhealthy workers through admin socket

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5786 from ceph/wip-12911
Josh Durgin [Thu, 10 Sep 2015 01:18:07 +0000 (21:18 -0400)]
Merge pull request #5786 from ceph/wip-12911

rbd export-diff should export data chunks in-order

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5858 from jecluis/wip-test-mon-scrub
Loic Dachary [Thu, 10 Sep 2015 00:55:55 +0000 (02:55 +0200)]
Merge pull request #5858 from jecluis/wip-test-mon-scrub

test: mon/mon-scrub.sh: have test running on make check

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agorgw: preserve all attrs if intra-zone copy 5863/head
Yehuda Sadeh [Wed, 9 Sep 2015 22:41:02 +0000 (15:41 -0700)]
rgw: preserve all attrs if intra-zone copy

Fixes: #13015
Intra zone copy requires that all objects' attributes are preserved.
This was broken at commit: e41d97c8e38bb60d7e09e9801c0179efe7af1734

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5442 from ceph/wip-12551
Sage Weil [Wed, 9 Sep 2015 20:21:07 +0000 (16:21 -0400)]
Merge pull request #5442 from ceph/wip-12551

ReplicatedPG,Objecter: copy_get should include truncate_seq and size

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5490 from dwj192/master
Yehuda Sadeh [Wed, 9 Sep 2015 18:38:24 +0000 (11:38 -0700)]
Merge pull request #5490 from dwj192/master

rgw:add --reset-regions for regionmap update

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agotest/Makefile.am: run mon/mon-scrub.sh as part of checks 5858/head
Joao Eduardo Luis [Wed, 9 Sep 2015 14:39:27 +0000 (15:39 +0100)]
test/Makefile.am: run mon/mon-scrub.sh as part of checks

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
9 years agotest: mon/mon-scrub.sh: port clashed with other tests
Joao Eduardo Luis [Wed, 9 Sep 2015 17:15:34 +0000 (18:15 +0100)]
test: mon/mon-scrub.sh: port clashed with other tests

This will allow the test to be run during make check.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #5828 from lebauce/fix-swift-prefix
Yehuda Sadeh [Wed, 9 Sep 2015 15:33:59 +0000 (08:33 -0700)]
Merge pull request #5828 from lebauce/fix-swift-prefix

rgw: add delimiter to prefix only when path is specified

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoReplicatedPG,Objecter: copy_get should include truncate_seq and size 5442/head
Samuel Just [Thu, 30 Jul 2015 23:59:32 +0000 (16:59 -0700)]
ReplicatedPG,Objecter: copy_get should include truncate_seq and size

Otherwise, we break CephFS over cache tiers.

Fixes: #12551
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #5837 from tchaikov/wip-12968
Loic Dachary [Wed, 9 Sep 2015 11:06:47 +0000 (13:06 +0200)]
Merge pull request #5837 from tchaikov/wip-12968

mon: disable gmt_hitset if not supported

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5842 from dzafman/wip-cot-failure
Kefu Chai [Wed, 9 Sep 2015 10:12:30 +0000 (18:12 +0800)]
Merge pull request #5842 from dzafman/wip-cot-failure

test: Fix failure test to find message anywhere in stderr

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agotest/librados: add test case for read object (off=0,len=0). 5334/head
Jianpeng Ma [Fri, 24 Jul 2015 02:25:41 +0000 (10:25 +0800)]
test/librados: add test case for read object (off=0,len=0).

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoosd: make read(off=0,len=0) ec-object work.
Jianpeng Ma [Fri, 24 Jul 2015 02:12:51 +0000 (10:12 +0800)]
osd: make read(off=0,len=0) ec-object work.

When len=0, it mean read the whole object. It can work when reading
no-ec object off=0 & len=0. But for ec-object, it can't work.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoMerge pull request #5845 from wonzhq/async-rx
Haomai Wang [Wed, 9 Sep 2015 07:20:01 +0000 (15:20 +0800)]
Merge pull request #5845 from wonzhq/async-rx

AsyncMessenger: add instance name in debug log when processing msg

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
9 years agoMerge pull request #5779 from dzafman/wip-misc-fix-guangyy
Loic Dachary [Wed, 9 Sep 2015 07:00:41 +0000 (09:00 +0200)]
Merge pull request #5779 from dzafman/wip-misc-fix-guangyy

osd: check the length of the map before accessing the first element

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5843 from dillaman/wip-12885
Josh Durgin [Wed, 9 Sep 2015 06:55:44 +0000 (02:55 -0400)]
Merge pull request #5843 from dillaman/wip-12885

librbd: diff_iterate needs to handle holes in parent images

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5592 from xinxinsh/wip-fix-rbd-metadata
Josh Durgin [Wed, 9 Sep 2015 06:54:45 +0000 (02:54 -0400)]
Merge pull request #5592 from xinxinsh/wip-fix-rbd-metadata

fix bugs of rbd metadata operation

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotest: Fix failure test to find message anywhere in stderr 5842/head
David Zafman [Tue, 8 Sep 2015 19:33:44 +0000 (12:33 -0700)]
test: Fix failure test to find message anywhere in stderr

Consolidate test_failure() and test_failure_tty()

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agorados: Fix usage for "notify" command
David Zafman [Tue, 8 Sep 2015 20:41:31 +0000 (13:41 -0700)]
rados: Fix usage for "notify" command

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #5834 from ceph/wip-leveldb-hang
Kefu Chai [Wed, 9 Sep 2015 04:46:03 +0000 (12:46 +0800)]
Merge pull request #5834 from ceph/wip-leveldb-hang

mon: MonitorDBStore: make get_next_key() work properly

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #4955 from kylinstorage/librados-2read-segmentation-fault-v1
Kefu Chai [Wed, 9 Sep 2015 04:45:01 +0000 (12:45 +0800)]
Merge pull request #4955 from kylinstorage/librados-2read-segmentation-fault-v1

bug fix: librados segmentation fault, when two read ops share one Aio…

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #4925 from XinzeChi/wip-hit-set-size
Kefu Chai [Wed, 9 Sep 2015 04:44:21 +0000 (12:44 +0800)]
Merge pull request #4925 from XinzeChi/wip-hit-set-size

osd: fix hit_set_map size for tier pool

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5723 from H3C/wip-msg-bugfix1
Kefu Chai [Wed, 9 Sep 2015 04:43:28 +0000 (12:43 +0800)]
Merge pull request #5723 from H3C/wip-msg-bugfix1

msg: we should set the socket options before connect or listen in order to have it take effect.

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5829 from dachary/wip-12731-jerasure-warnings
Kefu Chai [Wed, 9 Sep 2015 04:41:58 +0000 (12:41 +0800)]
Merge pull request #5829 from dachary/wip-12731-jerasure-warnings

erasure-code: fix gf-complete warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoAsyncMessenger: add instance name in debug log when processing msg 5845/head
Zhiqiang Wang [Wed, 9 Sep 2015 03:40:48 +0000 (11:40 +0800)]
AsyncMessenger: add instance name in debug log when processing msg

To better debug.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
9 years agorgw:add --reset-regions for regionmap update 5490/head
dwj192 [Wed, 9 Sep 2015 01:48:16 +0000 (09:48 +0800)]
rgw:add --reset-regions for regionmap update

Fixes: #12964
Signed-off-by: Weijun Duan <duanweijun@h3c.com>
9 years agoMerge pull request #5781 from dzafman/wip-eccleanup
David Zafman [Wed, 9 Sep 2015 01:25:58 +0000 (18:25 -0700)]
Merge pull request #5781 from dzafman/wip-eccleanup

osd, test: Minor clean-up from fast-read and error handling ec changes

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agolibrbd: diff_iterate needs to handle holes in parent images 5843/head
Jason Dillaman [Tue, 8 Sep 2015 19:47:37 +0000 (15:47 -0400)]
librbd: diff_iterate needs to handle holes in parent images

If a clone's parent image snapshot includes a discarded extent,
this was previously causing an assert failure.  Instead, ignore
any discard holes in the parent image.

Fixes: #12885
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: new test case for librbd diff_iterate over discard extents
Jason Dillaman [Tue, 8 Sep 2015 19:45:45 +0000 (15:45 -0400)]
tests: new test case for librbd diff_iterate over discard extents

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #5838 from ceph/wip-12861
Sage Weil [Tue, 8 Sep 2015 18:08:18 +0000 (14:08 -0400)]
Merge pull request #5838 from ceph/wip-12861

qa/workunits/rados/test_alloc_hint.sh: sudo to ls files

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5396 from XinzeChi/wip-scrub-promote
Sage Weil [Tue, 8 Sep 2015 15:41:38 +0000 (11:41 -0400)]
Merge pull request #5396 from XinzeChi/wip-scrub-promote

bug fix: osd: requeue_scrub when kick_object_context_blocked

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #5772 from yuyuyu101/wip-12912
Sage Weil [Tue, 8 Sep 2015 15:41:06 +0000 (11:41 -0400)]
Merge pull request #5772 from yuyuyu101/wip-12912

AsyncConnection: Close connection when unregistered connection met WAIT

9 years agoMerge pull request #5733 from cxwshawn/rgw-fix
Yehuda Sadeh [Tue, 8 Sep 2015 15:39:43 +0000 (08:39 -0700)]
Merge pull request #5733 from cxwshawn/rgw-fix

rgw: init_rados failed leads to repeated delete

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5809 from rzarzynski/wip-rgw_putobj_debug_improvement
Yehuda Sadeh [Tue, 8 Sep 2015 15:35:46 +0000 (08:35 -0700)]
Merge pull request #5809 from rzarzynski/wip-rgw_putobj_debug_improvement

rgw: improve debugs in RGWPutObj and RGWPutObj_ObjStore_SWIFT.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5567 from guce/rgw_check_key_parameter_conflict
Orit Wasserman [Tue, 8 Sep 2015 15:33:13 +0000 (17:33 +0200)]
Merge pull request #5567 from guce/rgw_check_key_parameter_conflict

rgw: add key parameter conflict check for radosgw-admin command line.

9 years agoMerge pull request #5819 from rzarzynski/wip-12950
Yehuda Sadeh [Tue, 8 Sep 2015 15:17:24 +0000 (08:17 -0700)]
Merge pull request #5819 from rzarzynski/wip-12950

rgw: don't append empty ETag HTTP header.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge remote-tracking branch 'gh/infernalis'
Sage Weil [Tue, 8 Sep 2015 15:02:54 +0000 (11:02 -0400)]
Merge remote-tracking branch 'gh/infernalis'

9 years agoqa/workunits/rados/test_alloc_hint.sh: sudo to ls files 5838/head
Kefu Chai [Tue, 8 Sep 2015 10:20:04 +0000 (18:20 +0800)]
qa/workunits/rados/test_alloc_hint.sh: sudo to ls files

The osd data dir is owned by ceph and not readable by other
non-root users.

Fixes: #12861
Signed-off-by: Kefu Chai <kchai@redhat.com>