]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agotests: fix signedness compilation warnings 3174/head
Loic Dachary [Sat, 13 Dec 2014 16:55:21 +0000 (17:55 +0100)]
tests: fix signedness compilation warnings

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3172 from dachary/wip-10146-retrigger-udev
Loic Dachary [Sat, 13 Dec 2014 16:42:29 +0000 (17:42 +0100)]
Merge pull request #3172 from dachary/wip-10146-retrigger-udev

ceph-disk: test re-using an existing journal partition

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph-disk: LOG.info instead of print 3172/head
Loic Dachary [Sat, 13 Dec 2014 11:20:03 +0000 (12:20 +0100)]
ceph-disk: LOG.info instead of print

When a non fatal error happens with parted, use LOG.info to display it
instead of print.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph-disk: test re-using an existing journal partition
Dan van der Ster [Fri, 12 Dec 2014 11:40:19 +0000 (12:40 +0100)]
ceph-disk: test re-using an existing journal partition

Add a ceph-disk test to first setup an OSD with a separate journal
block device, then tear down the OSD (simulating a failure) and create
a new OSD which re-uses the same journal device.

Add create_dev / destroy_dev helpers that encapsulate the operations
that ensure the partition table is up to date in the kernel and the
symlinks are created as expected. In particular it makes sure the kernel
is aware that the partition table of a newly created device is
empty. If the device previously existed and the kernel was not informed
of the latest partition table updates via partprobe / partx, it may
have cached an old partition table which can create all sorts of
unexpected behaviors such as a failure to create the by-partuuid
symbolic links as described in http://tracker.ceph.com/issues/10146
Refs: #10146

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph-disk: fix get_partition_uuid for loop/cciss
Dan van der Ster [Fri, 12 Dec 2014 11:35:42 +0000 (12:35 +0100)]
ceph-disk: fix get_partition_uuid for loop/cciss

Loopback and cciss devices have an extra 'p' before the partition
number. Add exceptional handling of these devices.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
10 years agoceph-disk: don't change the journal partition uuid
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>
10 years agodocumentation: simplify running make check
Loic Dachary [Sat, 6 Dec 2014 22:59:54 +0000 (23:59 +0100)]
documentation: simplify running make check

Encapsulate the compilation steps (install dependencies, autogen.sh,
configure, make check) in the run-make-check.sh script. Update the
developer documentation to point to this script instead of multiple
steps.

It is intended as a tool to help new developer make sure their patch is
sane, it focuses on efficiency (runs make check in parallel if possible)
and coverage (enables docker based tests if possible).

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: install parted in centos container
Loic Dachary [Sat, 13 Dec 2014 12:03:27 +0000 (13:03 +0100)]
tests: install parted in centos container

Because ceph-disk depends on it.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: install hdparm in containers
Loic Dachary [Sat, 13 Dec 2014 11:11:32 +0000 (12:11 +0100)]
tests: install hdparm in containers

The ceph-disk tests use hdparm, install it in containers that run
them.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: update centos docker file to epel 7.5
Loic Dachary [Fri, 12 Dec 2014 15:59:30 +0000 (16:59 +0100)]
tests: update centos docker file to epel 7.5

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: docker tests only need a workdir, not a clone
Loic Dachary [Sun, 7 Dec 2014 12:27:16 +0000 (13:27 +0100)]
tests: docker tests only need a workdir, not a clone

Instead of cloning the repository, create a work directory that has
symbolic links to the original .git, using

https://github.com/git/git/blob/master/contrib/workdir/git-new-workdir

It resolves the problem of fetching a commit that is not attached to any
ref, which is apparently not implemented in the git protocol (discussed
on irc.freenode.net#git).

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3126 from ceph/wip-cleanup-removal
David Zafman [Sat, 13 Dec 2014 00:42:43 +0000 (16:42 -0800)]
Merge pull request #3126 from ceph/wip-cleanup-removal

osd: Remove dead code related to old pg removal mechanism

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3141 from ceph/wip-librbd-test-cleanup
Josh Durgin [Fri, 12 Dec 2014 18:47:42 +0000 (10:47 -0800)]
Merge pull request #3141 from ceph/wip-librbd-test-cleanup

tests: Minor cleanup to librbd test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3160 from xylv/wip-8562-rebase
Yehuda Sadeh [Fri, 12 Dec 2014 18:41:08 +0000 (10:41 -0800)]
Merge pull request #3160 from xylv/wip-8562-rebase

rgw: Conditional PUT on ETag

Reviewed-by: Yehuda Sadeh <yehuda@rehat.com>
10 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Fri, 12 Dec 2014 14:22:06 +0000 (06:22 -0800)]
Merge remote-tracking branch 'gh/next'

10 years agoMerge pull request #3153 from ceph/wip-10296
Sage Weil [Fri, 12 Dec 2014 14:21:46 +0000 (06:21 -0800)]
Merge pull request #3153 from ceph/wip-10296

osd: fix block device discard detection

Reviewed-by: Loic Dachary <loic@dachary.org>
Tested-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #3144 from ceph/wip-aarch64
Loic Dachary [Fri, 12 Dec 2014 08:48:49 +0000 (09:48 +0100)]
Merge pull request #3144 from ceph/wip-aarch64

fixes for aarch64

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agorgw: Conditional PUT on ETag 3160/head
Ray Lv [Mon, 20 Oct 2014 10:57:46 +0000 (18:57 +0800)]
rgw: Conditional PUT on ETag

Fixes: #8562
Signed-off-by: Ray Lv <raylv@yahoo-inc.com>
10 years agounittest_blkdev: test an abbreviated /sys/block dir 3153/head
Sage Weil [Thu, 11 Dec 2014 21:48:32 +0000 (13:48 -0800)]
unittest_blkdev: test an abbreviated /sys/block dir

Note that we assume unittest_blkdev is run from the current directory (or
rather that test/common/test_blkdev_sys_block exists).

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocommon/blkdev: add simple sandboxing function for testing
Sage Weil [Thu, 11 Dec 2014 21:46:47 +0000 (13:46 -0800)]
common/blkdev: add simple sandboxing function for testing

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3155 from athanatos/wip-8011
Sage Weil [Thu, 11 Dec 2014 21:42:09 +0000 (13:42 -0800)]
Merge pull request #3155 from athanatos/wip-8011

ReplicatedPG: fail a non-blocking flush if the object is being scrubbed

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoReplicatedPG: fail a non-blocking flush if the object is being scrubbed 3155/head
Samuel Just [Thu, 20 Nov 2014 22:27:39 +0000 (14:27 -0800)]
ReplicatedPG: fail a non-blocking flush if the object is being scrubbed

Fixes: #8011
Backport: firefly, giant
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3154 from athanatos/wip-10059
Sage Weil [Thu, 11 Dec 2014 21:28:03 +0000 (13:28 -0800)]
Merge pull request #3154 from athanatos/wip-10059

Wip 10059

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3156 from athanatos/wip-10150
Sage Weil [Thu, 11 Dec 2014 21:23:28 +0000 (13:23 -0800)]
Merge pull request #3156 from athanatos/wip-10150

ReplicatedPG::scan_range: an object can disappear between the list and t...

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3157 from athanatos/wip-10157
Sage Weil [Thu, 11 Dec 2014 21:22:05 +0000 (13:22 -0800)]
Merge pull request #3157 from athanatos/wip-10157

PGLog: include rollback_info_trimmed_to in (read|write)_log

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3158 from athanatos/wip-10259
Sage Weil [Thu, 11 Dec 2014 21:16:13 +0000 (13:16 -0800)]
Merge pull request #3158 from athanatos/wip-10259

osd_types: op_queue_age_hist and fs_perf_stat should be in osd_stat_t::o...

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoReplicatedPG::scan_range: an object can disappear between the list and the attr get 3156/head
Samuel Just [Thu, 11 Dec 2014 21:05:54 +0000 (13:05 -0800)]
ReplicatedPG::scan_range: an object can disappear between the list and the attr get

The first item in the range is often last_backfill, upon which writes
can be occuring.  It's trimmed off on the primary side anyway.

Fixes: 10150
Backport: dumpling, firefly, giant
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #2579 from yuandong1222/cache-hboject-filestore
Samuel Just [Thu, 11 Dec 2014 21:02:22 +0000 (13:02 -0800)]
Merge pull request #2579 from yuandong1222/cache-hboject-filestore

Cache hobject filestore_key to avoid massive _reverse_nibbles calls

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3018 from tchaikov/wip-fix-safe_read_file
Samuel Just [Thu, 11 Dec 2014 21:00:45 +0000 (13:00 -0800)]
Merge pull request #3018 from tchaikov/wip-fix-safe_read_file

safe_io: do not set ending \0 in safe_read_file()

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3070 from ceph/wip-10080
Samuel Just [Thu, 11 Dec 2014 20:59:36 +0000 (12:59 -0800)]
Merge pull request #3070 from ceph/wip-10080

SimpleMessenger: allow RESETSESSION whenever we forget an endpoint

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agodebian: enable libgoogle-perftools-dev on arm64 3144/head
Noah Watkins [Thu, 11 Dec 2014 19:03:30 +0000 (12:03 -0700)]
debian: enable libgoogle-perftools-dev on arm64

These binaries haven't landed in Ubuntu, but they are in
sid and jessie for arm64. On Saucy I've installed them by
hand from ports.ubuntu.com and things seems pretty swell.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
10 years agoMerge pull request #3150 from ceph/wip-10288
Gregory Farnum [Thu, 11 Dec 2014 18:47:11 +0000 (10:47 -0800)]
Merge pull request #3150 from ceph/wip-10288

mon: fix `fs ls` on peons

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agocommon/blkdev: fix block device discard check
Sage Weil [Thu, 11 Dec 2014 18:07:48 +0000 (10:07 -0800)]
common/blkdev: fix block device discard check

- fix base name calculation (do not assume sda)
- reverse sense of check (it was returning false when true before?)
- add a generic helper to get other properties, too

Fixes: #10296
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocommon/blkdev: get_block_device_base
Sage Weil [Thu, 11 Dec 2014 17:50:01 +0000 (09:50 -0800)]
common/blkdev: get_block_device_base

And a test.  Ideally the test would get run on a machine with weirdo
devices like /dev/cciss/c0d1.

This mirrors the logic in ceph-disk, which has been tested.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3152 from dachary/wip-10296-journal-discard
Loic Dachary [Thu, 11 Dec 2014 18:15:05 +0000 (19:15 +0100)]
Merge pull request #3152 from dachary/wip-10296-journal-discard

os: do not attempt to detect discard by default

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agotests: do not ignore ceph-disk.sh::test_activate_dev failure 3152/head
Loic Dachary [Thu, 11 Dec 2014 17:33:31 +0000 (18:33 +0100)]
tests: do not ignore ceph-disk.sh::test_activate_dev failure

The status of the test commands must be tested instead of being
silently ignored.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoos: do not attempt to detect discard by default
Loic Dachary [Thu, 11 Dec 2014 17:30:07 +0000 (18:30 +0100)]
os: do not attempt to detect discard by default

If the journal_discard option is false, the journal should no try to
guess if the device has discard capabilities.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomon: fix `fs ls` on peons 3150/head
John Spray [Thu, 11 Dec 2014 14:00:57 +0000 (14:00 +0000)]
mon: fix `fs ls` on peons

This was incorrectly using pending_mdsmap instead
of mdsmap.  We didn't notice in test because of
single-mon configurations.

Fixes: #10288
Backport: giant

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3149 from ceph/wip-typo
Loic Dachary [Thu, 11 Dec 2014 13:25:50 +0000 (14:25 +0100)]
Merge pull request #3149 from ceph/wip-typo

mds: fix log typo

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomds: fix log typo 3149/head
John Spray [Thu, 11 Dec 2014 12:40:08 +0000 (12:40 +0000)]
mds: fix log typo

s/trvserse/traverse/

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3137 from thesues/fix-strtol
Sage Weil [Thu, 11 Dec 2014 05:10:57 +0000 (21:10 -0800)]
Merge pull request #3137 from thesues/fix-strtol

Fix libstriprados::remove, use strtoll insdead of strtol

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3038 from ceph/wip-mds-readonly
Gregory Farnum [Thu, 11 Dec 2014 04:39:37 +0000 (20:39 -0800)]
Merge pull request #3038 from ceph/wip-mds-readonly

Wip mds readonly

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #3145 from XinzeChi/wip-finisher
Sage Weil [Thu, 11 Dec 2014 04:34:34 +0000 (20:34 -0800)]
Merge pull request #3145 from XinzeChi/wip-finisher

Finisher: call cond signal if necessary in function queue

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoFinisher: call signal if necessary in function queue 3145/head
Xinze Chi [Thu, 11 Dec 2014 04:33:34 +0000 (04:33 +0000)]
Finisher: call signal if necessary in function queue

Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
10 years agolttng: add int type definitions
Noah Watkins [Thu, 11 Dec 2014 01:48:43 +0000 (18:48 -0700)]
lttng: add int type definitions

The normal path through #include <lttng/tracepoint.h> doesn't
appear to include int defintions like uint64_t that are used
in Ceph so we add our definitions file.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
10 years agocycles: add reader for i386 and aarch64
Noah Watkins [Thu, 11 Dec 2014 01:47:02 +0000 (18:47 -0700)]
cycles: add reader for i386 and aarch64

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
10 years agoMerge pull request #3119 from ceph/wip-8797
Loic Dachary [Wed, 10 Dec 2014 23:21:46 +0000 (00:21 +0100)]
Merge pull request #3119 from ceph/wip-8797

rados.py: remove Rados.__del__(); it just causes problems

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoCall Rados.shutdown() explicitly before exit 3119/head
Dan Mick [Wed, 10 Dec 2014 21:19:53 +0000 (13:19 -0800)]
Call Rados.shutdown() explicitly before exit

This is mostly a demonstration of good behavior, as the resources will
be reclaimed on exit anyway.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
10 years agorados.py: remove Rados.__del__(); it just causes problems
Dan Mick [Wed, 10 Dec 2014 21:19:16 +0000 (13:19 -0800)]
rados.py: remove Rados.__del__(); it just causes problems

Recent versions of Python contain a change to thread shutdown that
causes ceph to hang on exit; see http://bugs.python.org/issue21963.
As it turns out, this is relatively easy to avoid by not spawning
threads on exit, as Rados.__del__() will certainly do by calling
shutdown(); I suspect, but haven't proven, that the problem is
that shutdown() tries to start() a threading.Thread() that never
makes it all the way back to signal start().

Also add a PendingReleaseNote and extra doc comments to clarify.

Fixes: #8797
Signed-off-by: Dan Mick <dan.mick@redhat.com>
10 years agoMerge pull request #3129 from ceph/wip-gfcomplete-dirty
Gregory Farnum [Wed, 10 Dec 2014 21:14:05 +0000 (13:14 -0800)]
Merge pull request #3129 from ceph/wip-gfcomplete-dirty

gf-complete: update submodule to newest upstream

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3071 from ceph/wip-10164
Gregory Farnum [Wed, 10 Dec 2014 19:04:04 +0000 (11:04 -0800)]
Merge pull request #3071 from ceph/wip-10164

mds: drop dirty dentries in deleted directory

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agocheck endpoints is not empty before use it.
VRan Liu [Mon, 24 Nov 2014 02:35:41 +0000 (10:35 +0800)]
check endpoints is not empty before use it.

Signed-off-by: VRan Liu <gliuwr@gmail.com>
(cherry picked from commit 9d5e4edc15678de675d7a77badcbace0b710d553)

10 years agoMerge pull request #3135 from XinzeChi/wip-3
Sage Weil [Wed, 10 Dec 2014 16:39:32 +0000 (08:39 -0800)]
Merge pull request #3135 from XinzeChi/wip-3

os/FileStore.cc: insert not empty list<Context*> to op_finisher/ondisk_finisher

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoos/FileStore.cc: insert not empty list<Context*> to op_finisher/ondisk_finisher. 3135/head
Xinze Chi [Wed, 10 Dec 2014 17:00:43 +0000 (17:00 +0000)]
os/FileStore.cc: insert not empty list<Context*> to op_finisher/ondisk_finisher.

Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
10 years agoMerge pull request #3140 from leseb/sample-ceph.conf
Sage Weil [Wed, 10 Dec 2014 14:43:07 +0000 (06:43 -0800)]
Merge pull request #3140 from leseb/sample-ceph.conf

ceph.conf: update sample

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoceph.conf: update sample 3140/head
Sébastien Han [Wed, 10 Dec 2014 14:32:17 +0000 (15:32 +0100)]
ceph.conf: update sample

This commit adds:

* client admin socket
* change some default
* re-indent

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
10 years agotests: Minor cleanup to librbd test 3141/head
Jason Dillaman [Wed, 10 Dec 2014 13:56:59 +0000 (08:56 -0500)]
tests: Minor cleanup to librbd test

The tests can now be repeated to increase the chance of hitting
edge condition failures.  Also added additional logic to immediately
fail IO tests when an error is encountered.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoFix libstriprados::remove, use strtoll insdead of strtol 3137/head
Dongmao Zhang [Wed, 10 Dec 2014 10:55:28 +0000 (18:55 +0800)]
Fix libstriprados::remove, use strtoll insdead of strtol

Signed-off-by: Dongmao Zhang <deanraccoon@gmail.com>
10 years agoMerge pull request #3120 from ceph/wip-10010
Loic Dachary [Wed, 10 Dec 2014 10:12:45 +0000 (11:12 +0100)]
Merge pull request #3120 from ceph/wip-10010

ceph-osd: don't close stderr if not daemonizing

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomds: set dirfrag version when fetching dirfrag is skipped 3071/head
Yan, Zheng [Wed, 10 Dec 2014 03:05:02 +0000 (11:05 +0800)]
mds: set dirfrag version when fetching dirfrag is skipped

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoceph-osd: remove extra close of stderr 3120/head
Dan Mick [Tue, 9 Dec 2014 05:40:48 +0000 (21:40 -0800)]
ceph-osd: remove extra close of stderr

Otherwise, one loses log messages when running with -f or -d.  When
daemonizing, stderr is already closed in global_init_postfork_finish.

Fixes: #10010, #10113, #9810
Signed-off-by: Dan Mick <dan.mick@redhat.com>
10 years agogf-complete: update submodule to newest upstream 3129/head
Greg Farnum [Tue, 9 Dec 2014 23:28:47 +0000 (15:28 -0800)]
gf-complete: update submodule to newest upstream

Keep the tree cleaner!

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agoosd: Remove dead code related to old pg removal mechanism 3126/head
David Zafman [Mon, 8 Dec 2014 19:18:15 +0000 (11:18 -0800)]
osd: Remove dead code related to old pg removal mechanism

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #3073 from cholcombe973/get_pool_values_docs
Loic Dachary [Tue, 9 Dec 2014 10:41:17 +0000 (11:41 +0100)]
Merge pull request #3073 from cholcombe973/get_pool_values_docs

Updating docs for Get Pool Value

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoModifying the docs to add the Get pool commands to match the CLI. 3073/head
cholcombe973 [Thu, 4 Dec 2014 00:34:32 +0000 (16:34 -0800)]
Modifying the docs to add the Get pool commands to match the CLI.
Signed-off-by: Chris Holcombe <chris.holcombe@nebula.com>
10 years agoMerge pull request #3106 from danderson/asan-fixes
Loic Dachary [Mon, 8 Dec 2014 07:33:26 +0000 (08:33 +0100)]
Merge pull request #3106 from danderson/asan-fixes

Asan fixes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3113 from wonzhq/name-norm
Loic Dachary [Mon, 8 Dec 2014 07:09:50 +0000 (08:09 +0100)]
Merge pull request #3113 from wonzhq/name-norm

mailmap: Zhiqiang Wang name normalization

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Zhiqiang Wang name normalization 3113/head
Zhiqiang Wang [Mon, 8 Dec 2014 04:33:00 +0000 (12:33 +0800)]
mailmap: Zhiqiang Wang name normalization

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agoFix stack buffer overflow reported by ASan. 3106/head
David Anderson [Sun, 7 Dec 2014 22:40:09 +0000 (14:40 -0800)]
Fix stack buffer overflow reported by ASan.

Signed-off-by: David Anderson <dave@natulte.net>
10 years agoFix alloc-dealloc mismatch reported by ASan (new[] vs. delete).
David Anderson [Sun, 7 Dec 2014 20:02:48 +0000 (12:02 -0800)]
Fix alloc-dealloc mismatch reported by ASan (new[] vs. delete).

Signed-off-by: David Anderson <dave@natulte.net>
10 years agoFix alloc-dealloc mismatch reported by ASan (malloc vs. C++ delete).
David Anderson [Sun, 7 Dec 2014 19:52:54 +0000 (11:52 -0800)]
Fix alloc-dealloc mismatch reported by ASan (malloc vs. C++ delete).

Signed-off-by: David Anderson <dave@natulte.net>
10 years agoMerge pull request #3103 from danderson/ceph-dev-mode-python-envvar
Loic Dachary [Sun, 7 Dec 2014 10:12:06 +0000 (11:12 +0100)]
Merge pull request #3103 from danderson/ceph-dev-mode-python-envvar

ceph: respect the PYTHON environment variable for dev mode.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph: respect the PYTHON environment variable for dev mode. 3103/head
David Anderson [Sun, 7 Dec 2014 05:14:27 +0000 (21:14 -0800)]
ceph: respect the PYTHON environment variable for dev mode.

On OSes where `python` is python3, dev mode's re-exec makes the
ceph tool fail. The standard way to fix this is by exporting
the PYTHON envvar pointing to the python2 interpreter.

Signed-off-by: Dave Anderson <dave@natulte.net>
10 years agoMerge pull request #3099 from sileht/sileht/python-rados-object-lock
Loic Dachary [Sat, 6 Dec 2014 15:56:47 +0000 (16:56 +0100)]
Merge pull request #3099 from sileht/sileht/python-rados-object-lock

python-rados: Add object lock support

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agopython-rados: Add object lock support 3099/head
Mehdi Abaakouk [Fri, 5 Dec 2014 23:38:56 +0000 (23:38 +0000)]
python-rados: Add object lock support

This change adds to the python binding the support of:
 - rados_lock_exclusive
 - rados_lock_shared
 - rados_unlock

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

Signed-off-by: Mehdi Abaakouk <sileht@redhat.com>
10 years agoMerge pull request #3035 from dachary/wip-10197-arch-arm
Sage Weil [Sat, 6 Dec 2014 01:31:44 +0000 (17:31 -0800)]
Merge pull request #3035 from dachary/wip-10197-arch-arm

arch: add support for HW_CAP based neon runtime detection

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoosd_types: op_queue_age_hist and fs_perf_stat should be in osd_stat_t::operator== 3158/head
Samuel Just [Fri, 5 Dec 2014 23:29:52 +0000 (15:29 -0800)]
osd_types: op_queue_age_hist and fs_perf_stat should be in osd_stat_t::operator==

Fixes: 10259
Backport: giant, firefly, dumpling
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agocommon/ceph_context: don't import std namespace
Sage Weil [Fri, 5 Dec 2014 22:21:08 +0000 (14:21 -0800)]
common/ceph_context: don't import std namespace

This was broken by 7fed5dee4f96a83d1d6914f6fc0895bba2d15b99

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3020 from dachary/wip-10192-objectstore-tool-lookup
Loic Dachary [Fri, 5 Dec 2014 21:02:50 +0000 (22:02 +0100)]
Merge pull request #3020 from dachary/wip-10192-objectstore-tool-lookup

objectstore tool lookup by name & --op list filter

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph_objectstore_tool: Accept json object with --pgid instead of array 3020/head
David Zafman [Fri, 5 Dec 2014 02:53:08 +0000 (18:53 -0800)]
ceph_objectstore_tool: Accept json object with --pgid instead of array

It isn't anticipated that anyone would use this but keeps backward compatible

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph_objectstore_tool: Improve object spec parsing error messages
David Zafman [Fri, 5 Dec 2014 02:27:50 +0000 (18:27 -0800)]
ceph_objectstore_tool: Improve object spec parsing error messages

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph_objectstore_tool: Fix errors messages in newer code
David Zafman [Fri, 5 Dec 2014 01:48:28 +0000 (17:48 -0800)]
ceph_objectstore_tool: Fix errors messages in newer code

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph_objectstore_tool: Remove extraneous endl on error throw messages
David Zafman [Fri, 5 Dec 2014 00:00:40 +0000 (16:00 -0800)]
ceph_objectstore_tool: Remove extraneous endl on error throw messages

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph_objectstore_tool: Add --format and --pretty-format support
David Zafman [Thu, 4 Dec 2014 22:01:39 +0000 (14:01 -0800)]
ceph_objectstore_tool: Add --format and --pretty-format support

--pretty-format defaults true
Add --format so xml output can be requested
--op list defaults to single line of json per object
To override this more human readable output use --pretty-format=false
Add testing of --op list special handling

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years ago.gitignore: add ceph_perf_objectstore
Samuel Just [Fri, 5 Dec 2014 17:56:21 +0000 (09:56 -0800)]
.gitignore: add ceph_perf_objectstore

Signed-off-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2987 from yuyuyu101/wip-9888
Sage Weil [Fri, 5 Dec 2014 17:20:30 +0000 (09:20 -0800)]
Merge pull request #2987 from yuyuyu101/wip-9888

AsyncMessenger: Async event threads can shared by all AsyncMessenger

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3043 from yuyuyu101/objectstore-perf
Sage Weil [Fri, 5 Dec 2014 17:06:51 +0000 (09:06 -0800)]
Merge pull request #3043 from yuyuyu101/objectstore-perf

Objectstore::Transaction Perf Program

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3087 from dachary/wip-9785-dmcrypt-keys-permissions
Sage Weil [Fri, 5 Dec 2014 16:39:30 +0000 (08:39 -0800)]
Merge pull request #3087 from dachary/wip-9785-dmcrypt-keys-permissions

ceph-disk: dmcrypt file permissions

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3094 from yuandong1222/bufferlist-get_contiguous
Sage Weil [Fri, 5 Dec 2014 16:33:49 +0000 (08:33 -0800)]
Merge pull request #3094 from yuandong1222/bufferlist-get_contiguous

common: bufferlist::get_contiguous return 0 when param len == 0

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agocommon: bufferlist::get_contiguous return 0 when param len == 0 3094/head
Dong Yuan [Fri, 5 Dec 2014 19:31:35 +0000 (19:31 +0000)]
common: bufferlist::get_contiguous return 0 when param len == 0

Change-Id: I3eaee45b12c634687cd1b294b3c264aed8cab03a
Signed-off-by: Dong Yuan <yuandong1222@gmail.com>
10 years agoceph_objectstore_tool: Strip _* (always _head) from pgid in list entry output
David Zafman [Thu, 4 Dec 2014 01:53:11 +0000 (17:53 -0800)]
ceph_objectstore_tool: Strip _* (always _head) from pgid in list entry output

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph_objectstore_tool: BUG: --op list wasn't including snapshots
David Zafman [Thu, 4 Dec 2014 00:39:04 +0000 (16:39 -0800)]
ceph_objectstore_tool: BUG: --op list wasn't including snapshots

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph_objectstore_tool: For terminal output of list one object per line
David Zafman [Thu, 4 Dec 2014 00:38:22 +0000 (16:38 -0800)]
ceph_objectstore_tool: For terminal output of list one object per line

Instead of a parsable array make it easier to cut and paste listed objects

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph_objectstore_tool: In error case umount objectstore
David Zafman [Thu, 4 Dec 2014 00:35:09 +0000 (16:35 -0800)]
ceph_objectstore_tool: In error case umount objectstore

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoobjectstore_tool: test --op list variants
Loic Dachary [Thu, 27 Nov 2014 00:24:03 +0000 (01:24 +0100)]
objectstore_tool: test --op list variants

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoobjectstore_tool: parse new object description format
Loic Dachary [Wed, 26 Nov 2014 23:11:45 +0000 (00:11 +0100)]
objectstore_tool: parse new object description format

The object format changed from

    {json object}

to

    [pgid,{json object}]

The parser is updated accordingly. If the --pgid is present, check that
it equals the pgid from the object description.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoobjectstore_tool: filter --op list and explore all PGs
Loic Dachary [Wed, 26 Nov 2014 22:35:21 +0000 (23:35 +0100)]
objectstore_tool: filter --op list and explore all PGs

The positional object name is used to filter the output of --op list and
only show the objects with a matching name. If both the object name and
the pgid are omitted, all objects from all PGs are displayed.

The output format is changed from

    {"oid":"GROUP","key":"","snapid":-2,
     "hash":2659194943,"max":0,"pool":0,"namespace":""}

to

    [["0.7_head",{"oid":"GROUP","key":"","snapid":-2,
                  "hash":2659194943,"max":0,"pool":0,
                  "namespace":""}]]

where the first member is the pgid where the object is found.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoobjectstore_tool: lookup objects by name
Loic Dachary [Wed, 26 Nov 2014 22:34:22 +0000 (23:34 +0100)]
objectstore_tool: lookup objects by name

If the object is not a parsable JSON string, assume an object name and
look it up in all the PGs. If multiple objects have the same name, only
apply the command to one of them. It is primarily useful in a test
environment where the names of the tests objects are known and only a
small number of objects exists. It replaces the following:

    path='--data-path dev/osd0 --journal-path dev/osd0.journal'
    for pgid in $(./ceph_objectstore_tool $path --op list-pgs) ; do
      object=$(./ceph_objectstore_tool $path --pgid $pgid --op list |
               grep '"oid":"NAME"')
      test -n "$object" && break
    done
    ./ceph_objectstore_tool $path --pgid $pgid "$object" remove

with:

    ./ceph_objectstore_tool $path NAME remove

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoobjectstore_tool: refactor list-lost and fix-lost
Loic Dachary [Wed, 26 Nov 2014 16:30:30 +0000 (17:30 +0100)]
objectstore_tool: refactor list-lost and fix-lost

Abstract out the PG exploration loops and encapsulate the list-lost and
fix-lost semantic in a callable object.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoobjectstore_tool: update usage strings
Loic Dachary [Wed, 26 Nov 2014 16:26:54 +0000 (17:26 +0100)]
objectstore_tool: update usage strings

Signed-off-by: Loic Dachary <ldachary@redhat.com>