]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoMerge pull request #3564 from guangyy/wip-10198
Samuel Just [Fri, 1 May 2015 16:07:20 +0000 (09:07 -0700)]
Merge pull request #3564 from guangyy/wip-10198

osd: break the handling of PG removal event into multiple iterations

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3004 from guangyy/wip-10183
Samuel Just [Fri, 1 May 2015 16:01:47 +0000 (09:01 -0700)]
Merge pull request #3004 from guangyy/wip-10183

Add a new tick timer which does not need to hold osd_lock, put sched_scrub to that tick timer

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3659 from SUSE/wip-fix-calamari-health
Samuel Just [Fri, 1 May 2015 15:08:22 +0000 (08:08 -0700)]
Merge pull request #3659 from SUSE/wip-fix-calamari-health

Always provide summary for non-healthy cluster.

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3702 from mslovy/wip-fineGrain-submitManagerLock
Samuel Just [Fri, 1 May 2015 15:00:56 +0000 (08:00 -0700)]
Merge pull request #3702 from mslovy/wip-fineGrain-submitManagerLock

FileStore:: queue_transactions, fine-grain submitManager lock

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3919 from guangyy/wip-9558
Samuel Just [Fri, 1 May 2015 14:27:26 +0000 (07:27 -0700)]
Merge pull request #3919 from guangyy/wip-9558

osd : populate the needs_recovery_map source fast when only one peer has missing

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4493 from ceph/wip-use-get-linux-version
Gregory Farnum [Thu, 30 Apr 2015 20:40:03 +0000 (13:40 -0700)]
Merge pull request #4493 from ceph/wip-use-get-linux-version

use get_linux_version() instead ad-hoc uname().release parsing

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4461 from ceph/wip-11372
Josh Durgin [Thu, 30 Apr 2015 16:21:48 +0000 (09:21 -0700)]
Merge pull request #4461 from ceph/wip-11372

librbd: add valgrind memory checks for unit tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4241 from rzarzynski/wip-11285
Yehuda Sadeh [Thu, 30 Apr 2015 15:37:42 +0000 (08:37 -0700)]
Merge pull request #4241 from rzarzynski/wip-11285

rgw: rectify broken statistics on Swift account listing.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4432 from big-henry/wip-rgw-listparts
Yehuda Sadeh [Thu, 30 Apr 2015 15:32:56 +0000 (08:32 -0700)]
Merge pull request #4432 from big-henry/wip-rgw-listparts

rgw: fix ListParts response

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agopybind: fix valgrind warning on rbd_get_parent_info call 4461/head
Jason Dillaman [Tue, 28 Apr 2015 19:25:49 +0000 (15:25 -0400)]
pybind: fix valgrind warning on rbd_get_parent_info call

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoosdc: invalid read of freed memory
Jason Dillaman [Tue, 28 Apr 2015 15:12:00 +0000 (11:12 -0400)]
osdc: invalid read of freed memory

The bytes not in cache stat was potentially reading the bh length
from a deleted bufferhead.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agokrbd: fix incorrect types in the krbd API
Jason Dillaman [Tue, 28 Apr 2015 14:56:15 +0000 (10:56 -0400)]
krbd: fix incorrect types in the krbd API

The C API functions were referencing the C++ CephContext
instead of the C rados_config_t.  Additionally, the ceph
namespace was missing on the Formatter class.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agofsx: cleanup crypto library at exit
Jason Dillaman [Tue, 28 Apr 2015 14:54:47 +0000 (10:54 -0400)]
fsx: cleanup crypto library at exit

Also made small tweaks so that it can be compiled under
a C++ compiler.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoautotools: detect presence of valgrind
Jason Dillaman [Tue, 28 Apr 2015 01:30:26 +0000 (21:30 -0400)]
autotools: detect presence of valgrind

Conditionally enable running librbd unit tests under valgrind.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoqa/workunits/rbd: add support for running API tests under valgrind
Jason Dillaman [Mon, 27 Apr 2015 09:00:39 +0000 (05:00 -0400)]
qa/workunits/rbd: add support for running API tests under valgrind

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: run librbd valgrind test during 'make check'
Jason Dillaman [Fri, 24 Apr 2015 18:29:59 +0000 (14:29 -0400)]
tests: run librbd valgrind test during 'make check'

Fixes: #11372
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agovalgrind: update valgrind suppressions for lttng-ust
Jason Dillaman [Fri, 24 Apr 2015 04:23:03 +0000 (00:23 -0400)]
valgrind: update valgrind suppressions for lttng-ust

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4476 from dachary/wip-releases
Loic Dachary [Thu, 30 Apr 2015 11:52:17 +0000 (13:52 +0200)]
Merge pull request #4476 from dachary/wip-releases

doc: add giant v0.87.2 to the release timeline

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoconfig: Document that 'mds_max_file_size' is only read on FS creation
Wido den Hollander [Thu, 30 Apr 2015 11:03:23 +0000 (13:03 +0200)]
config: Document that 'mds_max_file_size' is only read on FS creation

Afterwards you have to change this through the monitors

10 years agoMerge pull request #4037 from osynge/wip-fix-disk-zap-sgdisk-invocation
Loic Dachary [Thu, 30 Apr 2015 09:46:29 +0000 (11:46 +0200)]
Merge pull request #4037 from osynge/wip-fix-disk-zap-sgdisk-invocation

Fix "disk zap" sgdisk invocation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoFix "disk zap" sgdisk invocation 4037/head
Owen Synge [Tue, 17 Mar 2015 14:41:33 +0000 (15:41 +0100)]
Fix "disk zap" sgdisk invocation

Fixes #11143

If the metadata on the disk is truly invalid, sgdisk would fail to zero
it in one go, because --mbrtogpt apparently tried to operate on the
metadata it read before executing --zap-all.

Splitting this up into two separate invocations to first zap everything
and then clear it properly fixes this issue.

Based on patch by Lars Marowsky-Bree <lmb@suse.com> in ceph-deploy.
Created by Vincent Untz <vuntz@suse.com>

Signed-off-by: Owen Synge <osynge@suse.com>
Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
10 years agoMerge pull request #4513 from SUSE/wip-suse-run-make-check
Loic Dachary [Thu, 30 Apr 2015 08:24:11 +0000 (10:24 +0200)]
Merge pull request #4513 from SUSE/wip-suse-run-make-check

run-make-check.sh: fix a copule of SUSE oddities

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agorun-make-check.sh: stricter check for yum/apt-get/zypper 4513/head
Tim Serong [Thu, 30 Apr 2015 07:44:10 +0000 (17:44 +1000)]
run-make-check.sh: stricter check for yum/apt-get/zypper

Believe it or not, it's possible (although not necessarily likely) to
have both yum and zypper installed on openSUSE.  In this case the
previous implementation using `which` would return a string containing
both commands, which doesn't work.

Signed-off-by: Tim Serong <tserong@suse.com>
10 years agorun-make-check.sh: use /sbin/modprobe
Tim Serong [Thu, 30 Apr 2015 07:35:58 +0000 (17:35 +1000)]
run-make-check.sh: use /sbin/modprobe

Rationale: In some cases (e.g.: by default on openSUSE), `sudo` won't
add /sbin to $PATH.

Signed-off-by: Tim Serong <tserong@suse.com>
10 years agoMerge pull request #4509 from wonzhq/miss-arg
Kefu Chai [Thu, 30 Apr 2015 03:33:46 +0000 (11:33 +0800)]
Merge pull request #4509 from wonzhq/miss-arg

librbd: missing an argument when calling invoke_async_request

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agolibrbd: missing an argument when calling invoke_async_request 4509/head
Zhiqiang Wang [Thu, 30 Apr 2015 02:47:06 +0000 (10:47 +0800)]
librbd: missing an argument when calling invoke_async_request

This prevents the master branch from compiling.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agoMerge pull request #4186 from ceph/wip-7787
Josh Durgin [Wed, 29 Apr 2015 23:42:03 +0000 (16:42 -0700)]
Merge pull request #4186 from ceph/wip-7787

librbd: add fast diff feature

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4381 from ceph/wip-system-retcode
David Zafman [Wed, 29 Apr 2015 23:15:39 +0000 (16:15 -0700)]
Merge pull request #4381 from ceph/wip-system-retcode

ceph-fuse: check return value on system() invocation

Reviewed-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #4457 from ceph/wip-client-osd-caps
Gregory Farnum [Wed, 29 Apr 2015 23:12:20 +0000 (16:12 -0700)]
Merge pull request #4457 from ceph/wip-client-osd-caps

client: check OSD caps before read/write

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoceph-fuse: check return value on system() invocation 4381/head
Greg Farnum [Fri, 17 Apr 2015 01:03:59 +0000 (18:03 -0700)]
ceph-fuse: check return value on system() invocation

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4495 from rzarzynski/wip-11501
Yehuda Sadeh [Wed, 29 Apr 2015 16:14:48 +0000 (09:14 -0700)]
Merge pull request #4495 from rzarzynski/wip-11501

rgw: fix broken account listing of Swift API.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4487 from ceph/wip-11464
Sage Weil [Wed, 29 Apr 2015 15:03:26 +0000 (08:03 -0700)]
Merge pull request #4487 from ceph/wip-11464

Revert "osd: For object op, first check object whether unfound."

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agorgw: fix broken account listing of Swift API. 4495/head
Radoslaw Zarzynski [Wed, 29 Apr 2015 14:37:16 +0000 (16:37 +0200)]
rgw: fix broken account listing of Swift API.

Fixes: #11501
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
10 years agouse get_linux_version() instead ad-hoc uname().release parsing 4493/head
Ilya Dryomov [Mon, 27 Apr 2015 07:49:26 +0000 (10:49 +0300)]
use get_linux_version() instead ad-hoc uname().release parsing

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
10 years agoMerge pull request #4445 from tchaikov/wip-doxygen-comments-in-throttle
Kefu Chai [Wed, 29 Apr 2015 06:35:44 +0000 (14:35 +0800)]
Merge pull request #4445 from tchaikov/wip-doxygen-comments-in-throttle

doc: doxygen comments in throttle

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4488 from ceph/wip-async-fix-6
Haomai Wang [Wed, 29 Apr 2015 03:36:47 +0000 (11:36 +0800)]
Merge pull request #4488 from ceph/wip-async-fix-6

Event: Delete driver after cleanup

10 years agoEvent: Delete driver after cleanup 4488/head
Haomai Wang [Wed, 29 Apr 2015 02:54:01 +0000 (10:54 +0800)]
Event: Delete driver after cleanup

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agorgw: fix ListParts response 4432/head
Henry Chang [Wed, 22 Apr 2015 10:26:45 +0000 (18:26 +0800)]
rgw: fix ListParts response

The response XML element name should be 'ListPartsResult'.

Fixes: #11494
Signed-off-by: Henry Chang <henry@bigtera.com>
10 years agoqa/workunits/post-file: pick a dir that's readable by world
Sage Weil [Wed, 29 Apr 2015 00:40:20 +0000 (17:40 -0700)]
qa/workunits/post-file: pick a dir that's readable by world

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoRevert "osd: For object op, first check object whether unfound." 4487/head
Sage Weil [Tue, 28 Apr 2015 22:19:37 +0000 (15:19 -0700)]
Revert "osd: For object op, first check object whether unfound."

This reverts commit b16b080332616f12852c15cd27e022a83ed86319.

It is normal for objects to be unfound for brief periods of time
after peering--we do not want to EIO in that case.

Fixes: #11464
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4483 from xinxinsh/wip-keyvalue-perfcounter
Sage Weil [Tue, 28 Apr 2015 19:48:03 +0000 (12:48 -0700)]
Merge pull request #4483 from xinxinsh/wip-keyvalue-perfcounter

add perf counter for keyvalue db

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agolibrbd: TaskFinisher should finish all queued tasks
Jason Dillaman [Fri, 24 Apr 2015 04:21:15 +0000 (00:21 -0400)]
librbd: TaskFinisher should finish all queued tasks

The destructor wasn't waiting for all Finisher tasks
to complete before stopping the thread.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: librados completions are not properly released
Jason Dillaman [Fri, 24 Apr 2015 04:20:00 +0000 (00:20 -0400)]
librbd: librados completions are not properly released

Changes associated with rebuilding the object map can result
in the leaking of librados AioCompletions.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: fix valgrind errors with librbd unit test
Jason Dillaman [Fri, 24 Apr 2015 03:10:23 +0000 (23:10 -0400)]
tests: fix valgrind errors with librbd unit test

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: librbd should release global data before exit
Jason Dillaman [Fri, 24 Apr 2015 03:09:45 +0000 (23:09 -0400)]
tests: librbd should release global data before exit

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrados_test_stub: cleanup singleton memory allocation
Jason Dillaman [Fri, 24 Apr 2015 03:08:51 +0000 (23:08 -0400)]
librados_test_stub: cleanup singleton memory allocation

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4480 from wonzhq/indent
Kefu Chai [Tue, 28 Apr 2015 12:02:24 +0000 (20:02 +0800)]
Merge pull request #4480 from wonzhq/indent

osd/ReplicatedPG: fix an indent in find_object_context

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4474 from ceph/wip-11482
John Spray [Tue, 28 Apr 2015 09:34:17 +0000 (11:34 +0200)]
Merge pull request #4474 from ceph/wip-11482

mds: remove caps from revoking list when caps are voluntarily released

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoosd/ReplicatedPG: fix an indent in find_object_context 4480/head
Zhiqiang Wang [Tue, 28 Apr 2015 08:45:04 +0000 (16:45 +0800)]
osd/ReplicatedPG: fix an indent in find_object_context

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agodoc: add giant v0.87.2 to the release timeline 4476/head
Loic Dachary [Tue, 28 Apr 2015 08:22:04 +0000 (10:22 +0200)]
doc: add giant v0.87.2 to the release timeline

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomds: remove caps from revoking list when caps are voluntarily released 4474/head
Yan, Zheng [Tue, 28 Apr 2015 07:45:32 +0000 (15:45 +0800)]
mds: remove caps from revoking list when caps are voluntarily released

Fixes: #11482
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoadd perf counter for rocksdb to evaluate latency of get and transaction commit 4483/head
xinxin shu [Tue, 28 Apr 2015 06:44:11 +0000 (14:44 +0800)]
add perf counter for rocksdb to evaluate latency of get and transaction commit

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
10 years agoadd perf counter for leveldb to evaluate latency of get&commit
xinxin shu [Tue, 28 Apr 2015 00:22:08 +0000 (08:22 +0800)]
add perf counter for leveldb to evaluate latency of get&commit

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
10 years agoMerge pull request #4454 from ceph/wip-11447
Josh Durgin [Mon, 27 Apr 2015 22:46:08 +0000 (15:46 -0700)]
Merge pull request #4454 from ceph/wip-11447

rgw: use correct oid when creating gc chains

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4471 from ceph/wip-11477
Josh Durgin [Mon, 27 Apr 2015 19:51:12 +0000 (12:51 -0700)]
Merge pull request #4471 from ceph/wip-11477

rbd: correct issues with cli integration tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4470 from ceph/wip-11475
Josh Durgin [Mon, 27 Apr 2015 19:45:18 +0000 (12:45 -0700)]
Merge pull request #4470 from ceph/wip-11475

librbd: correct issues discovered by Python unit tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agodoc/release-notes: v0.87.2
Sage Weil [Mon, 27 Apr 2015 18:44:53 +0000 (11:44 -0700)]
doc/release-notes: v0.87.2

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoclient: check OSD caps before read/write 4457/head
Yan, Zheng [Fri, 24 Apr 2015 07:23:21 +0000 (15:23 +0800)]
client: check OSD caps before read/write

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agotests: rbd cli integration test should explicitly select image format 4471/head
Jason Dillaman [Mon, 27 Apr 2015 05:58:06 +0000 (01:58 -0400)]
tests: rbd cli integration test should explicitly select image format

RBD format 2 is now the default image format, so tests involving the old
format should explicitly request the old format.

Fixes: #11477
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: do not attempt to retrieve metadata for old format images
Jason Dillaman [Mon, 27 Apr 2015 05:56:58 +0000 (01:56 -0400)]
librbd: do not attempt to retrieve metadata for old format images

An unnecessary error message is being logged due to a failure to retrieve
metadata for old-format images -- which don't support metadata.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: flatten should return -EROFS if image is read-only 4470/head
Jason Dillaman [Mon, 27 Apr 2015 05:03:52 +0000 (01:03 -0400)]
librbd: flatten should return -EROFS if image is read-only

Fixes: #11475
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: allow snapshots to be created when snapshot is active
Jason Dillaman [Mon, 27 Apr 2015 05:00:38 +0000 (01:00 -0400)]
librbd: allow snapshots to be created when snapshot is active

The librbd API previously permitted the creation of snapshots while
the image context was associated to another snapshot.  A recent code
cleanup broke that ability, so this re-introduces it.  The code change
also allows minor cleanup with rebuild_object_map.

Fixes: #11475
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4455 from liewegas/wip-civetweb-gitignore
Sage Weil [Sun, 26 Apr 2015 00:06:35 +0000 (17:06 -0700)]
Merge pull request #4455 from liewegas/wip-civetweb-gitignore

civetweb: add .gitignore

10 years agoMerge pull request #4434 from ceph/wip-7385
Josh Durgin [Fri, 24 Apr 2015 18:45:54 +0000 (11:45 -0700)]
Merge pull request #4434 from ceph/wip-7385

librbd: updated cache max objects calculation

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4395 from ceph/wip-11381
Gregory Farnum [Fri, 24 Apr 2015 18:20:41 +0000 (11:20 -0700)]
Merge pull request #4395 from ceph/wip-11381

Fix clear_pipe after reaping progress

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4440 from ceph/wip-11442
Josh Durgin [Fri, 24 Apr 2015 18:18:38 +0000 (11:18 -0700)]
Merge pull request #4440 from ceph/wip-11442

Wip 11442

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4401 from yuyuyu101/wip-async-fix-5
Sage Weil [Fri, 24 Apr 2015 17:43:06 +0000 (10:43 -0700)]
Merge pull request #4401 from yuyuyu101/wip-async-fix-5

Wip async fix 5

10 years agorgw_admin: add --remove-bad flag to bucket check 4440/head
Yehuda Sadeh [Wed, 22 Apr 2015 23:04:35 +0000 (16:04 -0700)]
rgw_admin: add --remove-bad flag to bucket check

Add this flag so that the bad object will be removed (should be called
only after user has verified that objects content is correct).

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4438 from oritwas/wip-10295
Yehuda Sadeh [Fri, 24 Apr 2015 16:26:24 +0000 (09:26 -0700)]
Merge pull request #4438 from oritwas/wip-10295

rgw: civetweb should use unique request id

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoAsyncMessenger: Don't need to join thread if not started 4401/head
Haomai Wang [Fri, 24 Apr 2015 13:18:50 +0000 (21:18 +0800)]
AsyncMessenger: Don't need to join thread if not started

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoFix clear_pipe after reaping progress 4395/head
Haomai Wang [Fri, 17 Apr 2015 14:07:00 +0000 (22:07 +0800)]
Fix clear_pipe after reaping progress

In pipe.cc:1353 we stop this connection and we will let reader and write threads stop. If now reader and writer quit ASAP and we call queue_reap to trigger the reap progress. Now we haven't call "connection_state->clear_pipe(this)" in pipe.cc:1379, so we may assert failure  here.

Fixes: #11381
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agocivetweb: add .gitignore 4455/head
Sage Weil [Thu, 23 Apr 2015 23:03:21 +0000 (16:03 -0700)]
civetweb: add .gitignore

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4165 from liewegas/wip-post-file
Sage Weil [Thu, 23 Apr 2015 22:39:11 +0000 (15:39 -0700)]
Merge pull request #4165 from liewegas/wip-post-file

qa/workunits/post-file.sh: s/base-files/aclocal/

10 years agorgw: use correct oid when creating gc chains 4454/head
Yehuda Sadeh [Thu, 23 Apr 2015 22:33:03 +0000 (15:33 -0700)]
rgw: use correct oid when creating gc chains

Fixes: #11447
Backport: hammer

When creating gc chain, use the appropriate oid, otherwise objects will
leak.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4439 from ceph/wip-11453-rgw-init-as-root
Sage Weil [Thu, 23 Apr 2015 22:05:57 +0000 (15:05 -0700)]
Merge pull request #4439 from ceph/wip-11453-rgw-init-as-root

#11453 init-radosgw: run RGW as root

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoinit-radosgw: run RGW as root 4439/head
Ken Dreyer [Wed, 22 Apr 2015 22:36:42 +0000 (16:36 -0600)]
init-radosgw: run RGW as root

The ceph-radosgw service fails to start if the httpd package is not
installed. This is because the init.d file attempts to start the RGW
process with the "apache" UID. If a user is running civetweb, there is
no reason for the httpd or apache2 package to be present on the system.

Switch the init scripts to use "root" as is done on Ubuntu.

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

Reported-by: Vickey Singh <vickey.singh22693@gmail.com>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agorgw: civetweb should use unique request id 4438/head
Orit Wasserman [Thu, 23 Apr 2015 15:36:47 +0000 (17:36 +0200)]
rgw: civetweb should use unique request id

max_req_id was moved to RGWRados and changed to atomic64_t.

The same request id resulted in gc giving the same idtag to all objects
resulting in a leakage of rados objects. It only kept the last deleted object in
it's queue, the previous objects were never freed.

Fixes: 10295
Backport: Hammer, Firefly

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
10 years agoMerge pull request #4451 from ceph/wip-kfsx-flush-on-discard
Josh Durgin [Thu, 23 Apr 2015 17:17:39 +0000 (10:17 -0700)]
Merge pull request #4451 from ceph/wip-kfsx-flush-on-discard

test_librbd_fsx: flush before discard in krbd mode

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agotest_librbd_fsx: flush before discard in krbd mode 4451/head
Ilya Dryomov [Thu, 23 Apr 2015 16:22:05 +0000 (19:22 +0300)]
test_librbd_fsx: flush before discard in krbd mode

We need to sync dirty pages before issuing BLKDISCARD, explained in
a comment.

Fixes: #11448
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
10 years agoMerge pull request #4448 from tchaikov/wip-check-libxml2-and-libcurl
Sage Weil [Thu, 23 Apr 2015 15:59:12 +0000 (08:59 -0700)]
Merge pull request #4448 from tchaikov/wip-check-libxml2-and-libcurl

configure.ac: check for libcurl and libxml2 if build libs3

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4446 from osynge/wip-expat
Sage Weil [Thu, 23 Apr 2015 15:48:13 +0000 (08:48 -0700)]
Merge pull request #4446 from osynge/wip-expat

libexpat is now used for rgw

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4444 from big-henry/wip-throttle
Kefu Chai [Thu, 23 Apr 2015 15:34:51 +0000 (23:34 +0800)]
Merge pull request #4444 from big-henry/wip-throttle

common: fix Throttle - unable to reenable throttling after disabling it

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoThrottle: reset max only if max changed 4444/head
Henry Chang [Thu, 23 Apr 2015 02:38:27 +0000 (10:38 +0800)]
Throttle: reset max only if max changed

Save some CPU cycles.

Signed-off-by: Henry Chang <henry@bigtera.com>
10 years agoThrottle: fix wait/get() with new max
Henry Chang [Wed, 22 Apr 2015 11:02:24 +0000 (19:02 +0800)]
Throttle: fix wait/get() with new max

We were unable to set a new non-zero max if the original max was 0.
Fix it. Also, add test cases for it.

Signed-off-by: Henry Chang <henry@bigtera.com>
10 years agoconfigure.ac: check for libcurl and libxml2 if build libs3 4448/head
Kefu Chai [Thu, 23 Apr 2015 12:18:20 +0000 (20:18 +0800)]
configure.ac: check for libcurl and libxml2 if build libs3

Fixes: #11458
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoThrottle: add more constness 4445/head
Kefu Chai [Thu, 23 Apr 2015 07:50:50 +0000 (15:50 +0800)]
Throttle: add more constness

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoThrottle: improve doxygen comments in Throttle
Kefu Chai [Thu, 23 Apr 2015 07:46:12 +0000 (15:46 +0800)]
Throttle: improve doxygen comments in Throttle

* reindent a line

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agolibexpat is now used for rgw 4446/head
Owen Synge [Thu, 23 Apr 2015 08:14:33 +0000 (10:14 +0200)]
libexpat is now used for rgw

Check for expat.h
check libexpat has method XML_Parse.

Signed-off-by: Owen Synge <osynge@suse.com>
10 years agoMerge pull request #4435 from ceph/wip-11451 4447/head
Josh Durgin [Wed, 22 Apr 2015 23:36:44 +0000 (16:36 -0700)]
Merge pull request #4435 from ceph/wip-11451

rgw: fix s3 list buckets

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agorgw-admin: a tool to fix object locator issue
Yehuda Sadeh [Wed, 22 Apr 2015 22:39:05 +0000 (15:39 -0700)]
rgw-admin: a tool to fix object locator issue

Objects that start with underscore need to have an object locator,
this is due to an old behavior that we need to retain. Some objects
might have been created without the locator. This tool creates a new
rados object with the appropriate locator.

Syntax:

$ ./radosgw-admin bucket check --check-head-obj-locator \
                               --bucket=<bucket> [--fix]

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: set a special object locator if object starts with underscore
Yehuda Sadeh [Wed, 22 Apr 2015 00:31:41 +0000 (17:31 -0700)]
rgw: set a special object locator if object starts with underscore

Fixes: #11442
Backport: hammer

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: fix s3 list buckets 4435/head
Yehuda Sadeh [Wed, 22 Apr 2015 17:35:32 +0000 (10:35 -0700)]
rgw: fix s3 list buckets

Fixes: #11451
Backport: hammer
Got broken in commit:7dd54fa3621c04c8ea5723fb1bc06b91d81a0c6c.
Resurrect the option to list unlimited number of buckets using the S3
api.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agolibrbd: updated cache max objects calculation 4434/head
Jason Dillaman [Wed, 22 Apr 2015 15:27:35 +0000 (11:27 -0400)]
librbd: updated cache max objects calculation

The previous calculation was based upon the image's object size.
Since the cache stores smaller bufferheads, the object size is not
a good indicator of cache usage and was resulting in objects being
evicted from the cache too often.  Instead, base the max number of
objects on the memory load required to store the extra metadata
for the objects.

Fixes: #7385
Backport: firefly, hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4426 from liewegas/wip-11330
Kefu Chai [Wed, 22 Apr 2015 09:18:56 +0000 (17:18 +0800)]
Merge pull request #4426 from liewegas/wip-11330

logrotate: prefer service over invoke-rc.d

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4425 from ceph/wip-10243
Orit Wasserman [Wed, 22 Apr 2015 08:38:33 +0000 (10:38 +0200)]
Merge pull request #4425 from ceph/wip-10243

civetweb: update max num of threads

10 years agoMerge pull request #4421 from dachary/wip-11441-osd-bench
Kefu Chai [Wed, 22 Apr 2015 07:37:54 +0000 (15:37 +0800)]
Merge pull request #4421 from dachary/wip-11441-osd-bench

tests: osd-bench.sh must be verbose on failure

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4430 from zhouyuan/fix_make_debs
Loic Dachary [Wed, 22 Apr 2015 07:35:27 +0000 (09:35 +0200)]
Merge pull request #4430 from zhouyuan/fix_make_debs

misc: fix make debs script

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4427 from big-henry/wip-mds-fix-integer-truncation
Yan, Zheng [Wed, 22 Apr 2015 07:20:54 +0000 (15:20 +0800)]
Merge pull request #4427 from big-henry/wip-mds-fix-integer-truncation

mds: fix integer truncation

10 years agomisc: fix make debs script 4430/head
Yuan Zhou [Wed, 22 Apr 2015 06:33:39 +0000 (14:33 +0800)]
misc: fix make debs script

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
10 years agoMerge pull request #4428 from wkennington/master.pgrefdebugging
Kefu Chai [Wed, 22 Apr 2015 05:58:21 +0000 (13:58 +0800)]
Merge pull request #4428 from wkennington/master.pgrefdebugging

configure.ac: fix the disablement of pgrefdebugging

Reviewed-by: Kefu Chai <kchai@redhat.com>