]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoosd: FileJournal: Add _fdump() that takes Formatter instead of ostream
David Zafman [Fri, 6 Mar 2015 03:16:45 +0000 (19:16 -0800)]
osd: FileJournal: Add _fdump() that takes Formatter instead of ostream

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 130eba48495d0e6acd8a472cbf0c47ebbc7a038c)

9 years agoosd: Add simple_dump() to FileJournal for unit testing
David Zafman [Wed, 18 Feb 2015 20:34:35 +0000 (12:34 -0800)]
osd: Add simple_dump() to FileJournal for unit testing

Allow a dump when entries aren't ObjectStore::Transaction's

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 8d5464c0f81aa9bb3be233a03bce64b505a265f4)

9 years agoosd: FileJournal clean-up
David Zafman [Wed, 18 Feb 2015 20:29:38 +0000 (12:29 -0800)]
osd: FileJournal clean-up

Move aio / directio adjustments to constructor
Indicate functions which only operate before journal is active
Make functions const when possible
Move push_back() of journalq to read_entry()
Change dump() to use do_read_entry() to minimize side effects

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 12fdf4ced0b2c17770c21204c8eccca8e4d0d2c9)

Conflicts:
src/os/FileJournal.cc (trivial)

9 years agoosd: Dump header in FileJournal::dump()
David Zafman [Fri, 6 Feb 2015 02:48:22 +0000 (18:48 -0800)]
osd: Dump header in FileJournal::dump()

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 3c97b32131e83c934b3d340eeb75284e898380c4)

9 years agoosd: FileJournal::read_entry() can't use a zero seq to check for corruption
David Zafman [Fri, 6 Feb 2015 02:40:25 +0000 (18:40 -0800)]
osd: FileJournal::read_entry() can't use a zero seq to check for corruption

Seen when using dump() on a journal which has all entries committed

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit a7cda53d20eb6d35203fce6ec9f7ea1df432bf53)

9 years agoosd: Fix flushing in FileJournal::dump()
David Zafman [Fri, 6 Feb 2015 02:36:01 +0000 (18:36 -0800)]
osd: Fix flushing in FileJournal::dump()

Use ostream arg since caller is specifying
Move flush after last section close

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit f2d83520f67fdc1b5a89b4ea742493a3df392989)

9 years agoosd: Add admin socket feature set_recovery_delay
David Zafman [Thu, 30 Apr 2015 17:20:24 +0000 (10:20 -0700)]
osd: Add admin socket feature set_recovery_delay

Set the value of osd_recovery_delay_start to specified seconds

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 73b17319379d904ffdf9479ca476da8e8e34e935)

Conflicts:
src/osd/OSD.cc (trivial)

9 years agoceph-objectstore-tool: For import/export --debug dump the log
David Zafman [Mon, 27 Apr 2015 22:37:14 +0000 (15:37 -0700)]
ceph-objectstore-tool: For import/export --debug dump the log

Move log dumping code to common function dump_log()

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 545c78c65f33fcac60b5aa7ee2b574ceb0211fd5)

9 years agoceph-objectstore-tool: If object re-appears after removal, just skip it
David Zafman [Sat, 31 Jan 2015 00:56:10 +0000 (16:56 -0800)]
ceph-objectstore-tool: If object re-appears after removal, just skip it

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit c6e41663e7434b4dcbb1abbe62ac008388da268a)

9 years agoceph-objectstore-tool: Add --no-overwrite flag for import-rados
David Zafman [Sat, 31 Jan 2015 00:11:13 +0000 (16:11 -0800)]
ceph-objectstore-tool: Add --no-overwrite flag for import-rados

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 35cdcabbdad7dc7249029630c64022c822c67ddc)

9 years agoceph-objectstore-tool: Remove list-lost because now we have --dry-run flag
David Zafman [Tue, 3 Feb 2015 00:23:18 +0000 (16:23 -0800)]
ceph-objectstore-tool: Remove list-lost because now we have --dry-run flag

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 3e7fe7e85716f80e055ffbc5305f406b3e020608)

9 years agoceph-objectstore-tool: Add --dry-run option
David Zafman [Fri, 23 Jan 2015 15:34:11 +0000 (07:34 -0800)]
ceph-objectstore-tool: Add --dry-run option

Fixes: #10290
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 2795161f470ab87cf4a82f455773c9b1b82946ef)

9 years agoceph-objectstore-tool: Add dump-info command to show object info
David Zafman [Thu, 22 Jan 2015 18:07:09 +0000 (10:07 -0800)]
ceph-objectstore-tool: Add dump-info command to show object info

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 244092d034781d2e980f9de7c6f9eea227967c5a)

9 years agoceph-objectstore-tool: Use empty string for <object> to specify pgmeta object
David Zafman [Tue, 27 Jan 2015 22:32:42 +0000 (14:32 -0800)]
ceph-objectstore-tool: Use empty string for <object> to specify pgmeta object

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit c00290b836adba12212e8a57f13b0c9193ac0ef8)

9 years agoceph-objectstore-tool: Add a couple of strategically placed prints
John Spray [Mon, 20 Apr 2015 16:28:15 +0000 (17:28 +0100)]
ceph-objectstore-tool: Add a couple of strategically placed prints

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit fdb1a4b676765c5d3ca5d436f34230dd6996d7a7)

9 years agoceph-objectstore-tool: Clean up error handling
David Zafman [Mon, 20 Apr 2015 23:10:18 +0000 (16:10 -0700)]
ceph-objectstore-tool: Clean up error handling

Use negative errors throughout and positive error to specify exit status
cpp_strerror() handles negative errors
Clean up main() code to use local "ret"
Let end of main() decide how to treat the final value of "ret"

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit a50679a1a3313e4090bf24f6e4dda28e7d67d731)

Adjust back cherry-pick f237ed97228839a1b412ad213945f0343df05bf5
    Switched to use ret as in the original change from master

9 years agoceph-objectstore-tool: Create section around log/missing/divergent_priors of --op log
David Zafman [Wed, 15 Apr 2015 22:40:41 +0000 (15:40 -0700)]
ceph-objectstore-tool: Create section around log/missing/divergent_priors of --op log

Remove extra new lines in the output

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 548147b412eebe57861768e5fd66360c2582d2c6)

9 years agoceph-objectstore-tool: Add divergent_priors handling
David Zafman [Tue, 14 Apr 2015 20:49:26 +0000 (13:49 -0700)]
ceph-objectstore-tool: Add divergent_priors handling

Add to --op log output
Add to metadata_section for export
Add filtering of divergent_priors in case of splits

Fixes: #11237
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 6ad7e9b362f437fe028fe59639489efe87b3525f)

9 years agoceph-objectstore-tool: Add --force option which is used for import only
David Zafman [Wed, 18 Mar 2015 17:05:24 +0000 (10:05 -0700)]
ceph-objectstore-tool: Add --force option which is used for import only

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 2f4090daaea715b896e49f678933abb8a13b5c98)

9 years agoceph-objectstore-tool: Fix pgid scan to skip snapdirs
David Zafman [Fri, 13 Mar 2015 07:41:39 +0000 (00:41 -0700)]
ceph-objectstore-tool: Fix pgid scan to skip snapdirs

Long standing bug where it wasn't skipping snapdirs if !debug
For debug output use stderr like all other cases

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 24f06598966319a62fa58a5831d9741fac1d471b)

9 years agoceph-objectstore-tool: Add dump-journal op
David Zafman [Mon, 9 Feb 2015 20:24:19 +0000 (12:24 -0800)]
ceph-objectstore-tool: Add dump-journal op

Have dump-journal op directly dump a filestore journal without
mounting or try to dump after mounting.

Fixes: #11135
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 381605e34a44edb9acfcfb5a56bd598b020e022f)

9 years agoceph-objectstore-tool: On any exit release CephContext so logging can flush
David Zafman [Mon, 9 Feb 2015 20:46:20 +0000 (12:46 -0800)]
ceph-objectstore-tool: On any exit release CephContext so logging can flush

Add myexit() which will put() the g_ceph_context if present before exit
Must umount() once the objectstore has been mounted

Fixes: #10809
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 409328bace0ffb3a457c0d384377bbbf37a2962d)

9 years agoceph-objectstore-tool: Check for keyvaluestore experimental feature
David Zafman [Tue, 10 Feb 2015 01:28:04 +0000 (17:28 -0800)]
ceph-objectstore-tool: Check for keyvaluestore experimental feature

Don't list keyvaluestore as a valid type if feature not enabled

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit fb2f9d500e52aa0834666550a684fe991701c9dd)

9 years agoceph-objectstore-tool: Eliminate obscure "Invalid params" error
David Zafman [Tue, 10 Feb 2015 01:14:50 +0000 (17:14 -0800)]
ceph-objectstore-tool: Eliminate obscure "Invalid params" error

Will fail later with "No such file or directory" for an empty data-path
because we've already checked for vm.count("data-path")

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit cfca6835bd53d535bde2793551211845b0facebd)

9 years agoceph-objectstore-tool: Check pgid validity earlier like we did before
David Zafman [Mon, 9 Feb 2015 23:37:57 +0000 (15:37 -0800)]
ceph-objectstore-tool: Check pgid validity earlier like we did before

This code was not doing the umount() even though it was moved after mount()

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 565b413df9c562a4071b9372d6362a9105c3538e)

9 years agoBackport the merge commit of branch 'wip-journal-header' of git://github.com/XinzeChi...
Sage Weil [Fri, 1 May 2015 16:22:01 +0000 (09:22 -0700)]
Backport the merge commit of branch 'wip-journal-header' of git://github.com/XinzeChi/ceph

(cherry picked from commit 8d596bfa24c9c3e2aadbb87494284cb5fd824e55)

Conflicts:
src/os/FileJournal.cc (trivial)
src/os/FileJournal.h (trivial)

Renamed write_header() to write_header_sync() in a merge
Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoosd: write journal header by force when journal write close
Xinze Chi [Tue, 3 Mar 2015 11:24:50 +0000 (11:24 +0000)]
osd: write journal header by force when journal write close

osd update the journal header when ceph call FileStore::sync_entry(
ApplyManager::commit_finish -> FileJournal::committed_thru).
But, it doesnot write the journal head until the next transaction
(calling do_write or do_aio_write).

So write jouranl header when journal write close, so that
committed_up_to in journal header is new enough. ceph may
not replay some transaction which has been writen to filestore.

Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit 8f80ae3fbaba7b0e64b6e4df6c2dddd10ac50e5a)

9 years agocrushtool: send --tree to stdout
Sage Weil [Sun, 8 Feb 2015 15:47:23 +0000 (07:47 -0800)]
crushtool: send --tree to stdout

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

Conflicts:
src/tools/crushtool.cc (trivial)

9 years agoMerge pull request #7501 from SUSE/wip-14624-hammer 7585/head
Loic Dachary [Mon, 8 Feb 2016 07:19:57 +0000 (14:19 +0700)]
Merge pull request #7501 from SUSE/wip-14624-hammer

hammer: fsx failed to compile

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #7524 from ktdreyer/wip-14637-hammer-man-radosgw-admin-orphans
Sage Weil [Sat, 6 Feb 2016 02:10:46 +0000 (21:10 -0500)]
Merge pull request #7524 from ktdreyer/wip-14637-hammer-man-radosgw-admin-orphans

hammer: doc: regenerate man pages, add orphans commands to radosgw-admin(8)

9 years agoMerge pull request #7526 from ceph/wip-14516-hammer
Orit Wasserman [Fri, 5 Feb 2016 09:30:22 +0000 (10:30 +0100)]
Merge pull request #7526 from ceph/wip-14516-hammer

hammer: rgw-admin: document orphans commands in usage

9 years agoMerge pull request #7441 from odivlad/backport-pr-14569
Loic Dachary [Fri, 5 Feb 2016 05:47:33 +0000 (12:47 +0700)]
Merge pull request #7441 from odivlad/backport-pr-14569

[backport] hammer: rgw: Make RGW_MAX_PUT_SIZE configurable

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #7442 from odivlad/backport-pr-14570
Loic Dachary [Fri, 5 Feb 2016 05:46:54 +0000 (12:46 +0700)]
Merge pull request #7442 from odivlad/backport-pr-14570

[backport] rgw: fix wrong etag calculation during POST on S3 bucket.

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agorgw-admin: document orphans commands in usage 7526/head
Yehuda Sadeh [Tue, 2 Feb 2016 00:33:55 +0000 (16:33 -0800)]
rgw-admin: document orphans commands in usage

Fixes: #14516
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 105a76bf542e05b739d5a03ca8ae55432350f107)

Conflicts:
src/rgw/rgw_admin.cc (trivial resolution)

9 years ago[backport] rgw: fix wrong etag calculation during POST on S3 bucket. 7442/head
Radoslaw Zarzynski [Mon, 21 Sep 2015 18:32:29 +0000 (20:32 +0200)]
[backport] rgw: fix wrong etag calculation during POST on S3 bucket.

Closes: #14570
(cherry picked from commit 742906a)

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Signed-off-by: Vladislav Odintsov <odivlad@gmail.com>
Tested-by: Vladislav Odintsov <odivlad@gmail.com>
9 years ago[backport] rgw: Make RGW_MAX_PUT_SIZE configurable 7441/head
Yuan Zhou [Thu, 9 Jul 2015 08:56:07 +0000 (16:56 +0800)]
[backport] rgw: Make RGW_MAX_PUT_SIZE configurable

The 5GB limit of a single operation uploading was part of S3 spec.
However some private setups may have some special requirements
on this limit. It's more convinent to have a configurable value.

Closes: http://tracker.ceph.com/issues/14569
(cherry picked from commit df97f28)

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
Signed-off-by: Vladislav Odintsov <odivlad@gmail.com>
Tested-by: Vladislav Odintsov <odivlad@gmail.com>
9 years agodoc: add orphans commands to radosgw-admin(8) 7524/head
Ken Dreyer [Thu, 4 Feb 2016 02:51:58 +0000 (19:51 -0700)]
doc: add orphans commands to radosgw-admin(8)

The --help text was added in 105a76bf542e05b739d5a03ca8ae55432350f107.
Add the corresponding entries to the man page.

Fixes: #14637
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit ec162f068b40f594c321df5caa9fe2541551b89e)
  Cherry-pick to hammer includes nroff source change (in master the
  nroff sources are no longer present in Git.)

9 years agoman: rebuild manpages
Ken Dreyer [Thu, 4 Feb 2016 18:04:39 +0000 (11:04 -0700)]
man: rebuild manpages

following the procedure in admin/manpage-howto.txt.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
9 years agofsx: checkout old version until it compiles properly on miras 7500/head 7501/head
Greg Farnum [Wed, 13 Jan 2016 21:17:53 +0000 (13:17 -0800)]
fsx: checkout old version until it compiles properly on miras

I sent a patch to xfstests upstream at
http://article.gmane.org/gmane.comp.file-systems.fstests/1665, but
until that's fixed we need a version that works in our test lab.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 7d52372ae74878ebd001036ff0a7aad525eb15b6)

9 years agoMerge pull request #7454 from dachary/wip-14584-hammer
Loic Dachary [Wed, 3 Feb 2016 05:41:56 +0000 (12:41 +0700)]
Merge pull request #7454 from dachary/wip-14584-hammer

hammer: fsstress.sh fails

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6918 from asheplyakov/hammer-bug-12449
Loic Dachary [Wed, 3 Feb 2016 04:38:57 +0000 (11:38 +0700)]
Merge pull request #6918 from asheplyakov/hammer-bug-12449

osd: check for full before changing the cached obc (hammer)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoqa/fsstress.sh: fix 'cp not writing through dangling symlink' 7454/head
Yan, Zheng [Tue, 18 Aug 2015 07:22:55 +0000 (15:22 +0800)]
qa/fsstress.sh: fix 'cp not writing through dangling symlink'

On some test machines, /usr/lib/ltp/testcases/bin/fsstress is
dangling symlink. 'cp -f' is impotent in this case.

Fixes: #12710
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 479f2a760baf6af4714d3391a366a6b3acf1bcaf)

9 years agoMerge pull request #7236 from athanatos/wip-14376
Sage Weil [Sun, 31 Jan 2016 02:42:29 +0000 (21:42 -0500)]
Merge pull request #7236 from athanatos/wip-14376

config_opts: increase suicide timeout to 300 to match recovery

http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6450 from dachary/wip-13672-hammer
Sage Weil [Sun, 31 Jan 2016 02:42:12 +0000 (21:42 -0500)]
Merge pull request #6450 from dachary/wip-13672-hammer

tests: testprofile must be removed before it is re-created

http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6680 from SUSE/wip-13859-hammer
Sage Weil [Sun, 31 Jan 2016 02:41:39 +0000 (21:41 -0500)]
Merge pull request #6680 from SUSE/wip-13859-hammer

hammer: ceph.spec.in License line does not reflect COPYING

http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/

9 years agoMerge pull request #6791 from branch-predictor/bp-5812-backport
Sage Weil [Sun, 31 Jan 2016 02:41:18 +0000 (21:41 -0500)]
Merge pull request #6791 from branch-predictor/bp-5812-backport

Race condition in rados bench

http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/

9 years agoMerge pull request #6973 from dreamhost/wip-configure-hammer
Sage Weil [Sun, 31 Jan 2016 02:40:38 +0000 (21:40 -0500)]
Merge pull request #6973 from dreamhost/wip-configure-hammer

configure.ac: no use to add "+" before ac_ext=c

http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7206 from dzafman/wip-14292
Sage Weil [Sun, 31 Jan 2016 02:40:13 +0000 (21:40 -0500)]
Merge pull request #7206 from dzafman/wip-14292

osd/PG.cc: 3837: FAILED assert(0 == "Running incompatible OSD")

http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/

Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #7207 from rldleblanc/recency_fix_for_hammer
Sage Weil [Sun, 31 Jan 2016 02:39:42 +0000 (21:39 -0500)]
Merge pull request #7207 from rldleblanc/recency_fix_for_hammer

hammer: osd/ReplicatedPG: Recency fix for Hammer

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7347 from tchaikov/wip-hammer-10093
Sage Weil [Sun, 31 Jan 2016 02:39:11 +0000 (21:39 -0500)]
Merge pull request #7347 from tchaikov/wip-hammer-10093

tools: ceph-monstore-tool must do out_store.close()

http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7411 from dachary/wip-14467-hammer
Sage Weil [Sun, 31 Jan 2016 02:38:35 +0000 (21:38 -0500)]
Merge pull request #7411 from dachary/wip-14467-hammer

hammer: disable filestore_xfs_extsize by default

http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7412 from dachary/wip-14470-hammer
Sage Weil [Sun, 31 Jan 2016 02:38:13 +0000 (21:38 -0500)]
Merge pull request #7412 from dachary/wip-14470-hammer

tools: tool for artificially inflate the leveldb of the mon store for testing purposes

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7446 from liewegas/wip-14537-hammer
Sage Weil [Sun, 31 Jan 2016 02:37:46 +0000 (21:37 -0500)]
Merge pull request #7446 from liewegas/wip-14537-hammer

mon: compact full epochs also

http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7182 from dachary/wip-14143-hammer
Josh Durgin [Sat, 30 Jan 2016 19:45:31 +0000 (11:45 -0800)]
Merge pull request #7182 from dachary/wip-14143-hammer

hammer: Verify self-managed snapshot functionality on image create

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7183 from dachary/wip-14283-hammer
Josh Durgin [Sat, 30 Jan 2016 19:45:20 +0000 (11:45 -0800)]
Merge pull request #7183 from dachary/wip-14283-hammer

hammer: rbd: fix bench-write

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7416 from dachary/wip-14466-hammer
Josh Durgin [Sat, 30 Jan 2016 19:45:05 +0000 (11:45 -0800)]
Merge pull request #7416 from dachary/wip-14466-hammer

hammer: rbd-replay does not check for EOF and goes to endless loop

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7417 from dachary/wip-14553-hammer
Josh Durgin [Sat, 30 Jan 2016 19:44:50 +0000 (11:44 -0800)]
Merge pull request #7417 from dachary/wip-14553-hammer

hammer: rbd: TaskFinisher::cancel should remove event from SafeTimer

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7407 from dillaman/wip-14543-hammer
Josh Durgin [Sat, 30 Jan 2016 19:44:32 +0000 (11:44 -0800)]
Merge pull request #7407 from dillaman/wip-14543-hammer

librbd: ImageWatcher shouldn't block the notification thread

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6980 from dillaman/wip-14063-hammer
Josh Durgin [Sat, 30 Jan 2016 19:44:12 +0000 (11:44 -0800)]
Merge pull request #6980 from dillaman/wip-14063-hammer

librbd: fix merge-diff for >2GB diff-files

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agomon: compact full epochs also 7446/head
Kefu Chai [Thu, 28 Jan 2016 10:09:53 +0000 (02:09 -0800)]
mon: compact full epochs also

by compacting the ${prefix}.${start}..${prefix}..${end} does not
necessary compact the range of ${prefix}."full_"${start}..
${prefix}."full_"${end}. so when more and more epochs get trimmed
with out a full range compaction, the size of monitor store could
be very large.

Fixes: #14537
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 93d633a25ad8c36c972bb766c38187e2612041e1)

9 years agoCheck for full before changing the cached obc 6918/head
Alexey Sheplyakov [Wed, 16 Dec 2015 12:31:52 +0000 (15:31 +0300)]
Check for full before changing the cached obc

ReplicatedPG::prepare_transaction(): check if the pool is full before
updating the cached ObjectContext to avoid the discrepancy between
the cached and the actual object size (and other metadata).
While at it improve the check itself: consider cluster full flag,
not just the pool full flag, also consider object count changes too,
not just bytes.

Based on commit a1eb380c3d5254f9f1fe34b4629e51d77fe010c1

Fixes: #13335
Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
9 years agoMerge pull request #6353 from theanalyst/wip-13513-hammer
Loic Dachary [Fri, 29 Jan 2016 16:31:47 +0000 (23:31 +0700)]
Merge pull request #6353 from theanalyst/wip-13513-hammer

rgw: value of Swift API's X-Object-Manifest header is not url_decoded during segment look up

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #6620 from SUSE/wip-13820-hammer
Loic Dachary [Fri, 29 Jan 2016 16:31:16 +0000 (23:31 +0700)]
Merge pull request #6620 from SUSE/wip-13820-hammer

hammer: rgw: Setting ACL on Object removes ETag

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #7186 from dachary/wip-13888-hammer
Loic Dachary [Fri, 29 Jan 2016 16:30:57 +0000 (23:30 +0700)]
Merge pull request #7186 from dachary/wip-13888-hammer

hammer: rgw: orphans finish segfaults

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoosd: recency should look at newest (not oldest) hitsets 7207/head
Sage Weil [Wed, 25 Nov 2015 19:40:26 +0000 (14:40 -0500)]
osd: recency should look at newest (not oldest) hitsets

Reported-by: xinxin shu <xinxin.shu@intel.com>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 528eae92d010ea34ae8cf0e8b2290aaa5e058d24)

Conflicts:
src/osd/ReplicatedPG.cc
                    code section was moved to ReplicatedPG::maybe_promote
                    in master.
Signed-off-by: Robert LeBlanc <robert.leblanc@endurance.com>
9 years agoosd/ReplicatedPG: fix promotion recency logic
Sage Weil [Wed, 25 Nov 2015 19:39:08 +0000 (14:39 -0500)]
osd/ReplicatedPG: fix promotion recency logic

Recency is defined as how many of the last N hitsets an object
must appear in in order to be promoted.  The previous logic did
nothing of the sort... it checked for the object in any one of
the last N hitsets, which led to way to many promotions and killed
any chance of the cache performing properly.

While we are here, we can simplify the code to drop the max_in_*
fields (no longer necessary).

Note that we may still want a notion of 'temperature' that does
tolerate the object missing in one of the recent hitsets.. but
that would be different than recency, and should probably be
modeled after the eviction temperature model.

Backport: infernalis, hammer
Reported-by: Nick Fisk <nick@fisk.me.uk>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 180c8743addc5ae2f1db9c58cd2996ca6e7ac18b)

Conflicts:
src/osd/ReplicatedPG.cc
                    code section was moved to ReplicatedPG::maybe_promote
                    in master.
Signed-off-by: Robert LeBlanc <robert.leblanc@endurance.com>
9 years agoMerge pull request #5789 from SUSE/wip-12928-hammer
Sage Weil [Fri, 29 Jan 2016 13:52:51 +0000 (08:52 -0500)]
Merge pull request #5789 from SUSE/wip-12928-hammer

rpm: libcephfs_jni1 has no %post and %postun

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7434 from tchaikov/wip-14441-hammer
Sage Weil [Fri, 29 Jan 2016 13:50:56 +0000 (08:50 -0500)]
Merge pull request #7434 from tchaikov/wip-14441-hammer

man: document listwatchers cmd in "rados" manpage

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoman: document listwatchers cmd in "rados" manpage 7433/head 7434/head
Kefu Chai [Wed, 23 Dec 2015 03:23:38 +0000 (11:23 +0800)]
man: document listwatchers cmd in "rados" manpage

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit c2e391301efc43f0b431e89737246b2c43bf10a9)

man/rados.8: also added the rendered man.8 man page, as we don't
             put the generated man pages in master anymore. but
             they are still in the hammer's source repo.

9 years agorbd: remove canceled tasks from timer thread 7417/head
Douglas Fuller [Fri, 22 Jan 2016 19:18:40 +0000 (11:18 -0800)]
rbd: remove canceled tasks from timer thread

When canceling scheduled tasks using the timer thread, TaskFinisher::cancel
does not call SafeTimer::cancel_event, so events fire anyway. Add this call.

Fixes: #14476
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
(cherry picked from commit 2aa0f318c862dbe3027d74d345671506605778eb)

9 years agorbd-replay: handle EOF gracefully 7416/head
Mykola Golub [Thu, 21 Jan 2016 11:45:42 +0000 (13:45 +0200)]
rbd-replay: handle EOF gracefully

Fixes: #14452
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit c59b84c3e2c9bbda68219e4d2288a889dd9ca6cb)

Conflicts:
src/rbd_replay/BufferReader.cc: trivial resolution
        caused by s/CEPH_PAGE_SIZE/CEPH_BUFFER_APPEND_SIZE/
        in the context of one hunk.

9 years agotools: monstore: add 'show-versions' command. 7412/head
Cilang Zhao [Tue, 5 Jan 2016 06:34:05 +0000 (14:34 +0800)]
tools: monstore: add 'show-versions' command.

Using this tool, the first/last committed version of maps will be shown.

Signed-off-by: Cilang Zhao <zhao.cilang@h3c.com>
(cherry picked from commit 21e6ba0c18428caff45733e6b43d197be38af8bb)

9 years agotools: ceph_monstore_tool: add inflate-pgmap command
Kefu Chai [Wed, 16 Sep 2015 10:28:52 +0000 (18:28 +0800)]
tools: ceph_monstore_tool: add inflate-pgmap command

this command repeatly add the latest pgmap to the monstore in order
to inflate it. the command helps with the testing of some monstore
related performance issue of monitor

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

9 years agotools:support printing the crushmap in readable fashion.
Bo Cai [Tue, 20 Oct 2015 07:23:49 +0000 (15:23 +0800)]
tools:support printing the crushmap in readable fashion.

Signed-off-by: Bo Cai <cai.bo@h3c.com>
(cherry picked from commit b7faf678ed0241abc7eb86b9baaa6db669a22d53)

9 years agotools:print the map infomation in human readable format.
Bo Cai [Mon, 14 Sep 2015 11:50:47 +0000 (19:50 +0800)]
tools:print the map infomation in human readable format.

Signed-off-by: Bo Cai <cai.bo@h3c.com>
(cherry picked from commit 5ed8cdc19150382c946a373ec940d76f98e6ecb7)

9 years agotools:remove the local file when get map failed.
Bo Cai [Mon, 14 Sep 2015 11:19:05 +0000 (19:19 +0800)]
tools:remove the local file when get map failed.

Signed-off-by: Bo Cai <cai.bo@h3c.com>
(cherry picked from commit 0b03b32d8ba76fe9f6f1158e68eb440e3670393a)

9 years agotools: ceph_monstore_tool: describe behavior of rewrite command
Joao Eduardo Luis [Mon, 13 Jul 2015 11:35:13 +0000 (12:35 +0100)]
tools: ceph_monstore_tool: describe behavior of rewrite command

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

9 years agotools/ceph-monstore-tools: add rewrite command
Kefu Chai [Fri, 19 Jun 2015 14:57:57 +0000 (22:57 +0800)]
tools/ceph-monstore-tools: add rewrite command

"rewrite" command will
 - add a new osdmap version to update current osdmap held by OSDMonitor
 - add a new paxos version, as a proposal it will
   * rewrite all osdmap epochs from specified epoch to  the last_committed
     one with the specified crush map.
   * add the new osdmap which is added just now
so the leader monitor can trigger a recovery process to apply the transaction
to all monitors in quorum, and hence bring them back to normal after being
injected with a faulty crushmap.

Fixes: #11815
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 306373427836ca0c2418dbe6caab26d74d94d12e)

9 years agotools: ceph-monstore-tool must do out_store.close()
huangjun [Tue, 21 Apr 2015 06:04:40 +0000 (14:04 +0800)]
tools: ceph-monstore-tool must do out_store.close()

this change fixes the "store-copy" command.
Like the bug reported in http://tracker.ceph.com/issues/10093.

Signed-off-by: huangjun <hjwsm1989@gmail.com>
(cherry picked from commit d85e0f8c50fce62be012506f7ffcb1cdeb0c819c)

9 years agoosd: disable filestore_xfs_extsize by default 7411/head
Ken Dreyer [Mon, 18 Jan 2016 15:24:46 +0000 (08:24 -0700)]
osd: disable filestore_xfs_extsize by default

This option involves a tradeoff: When disabled, fragmentation is worse,
but large sequential writes are faster. When enabled, large sequential
writes are slower, but fragmentation is reduced.

Fixes: #14397
(cherry picked from commit aed85775bf53c273786ce4999320134822722af5)

9 years agoMerge pull request #7316 from ceph/wip-deb-lttng-hammer
Loic Dachary [Fri, 29 Jan 2016 03:36:05 +0000 (10:36 +0700)]
Merge pull request #7316 from ceph/wip-deb-lttng-hammer

deb: strip tracepoint libraries from Wheezy/Precise builds

All other "modern" Debian-based OSes have a functional LTTng-UST. Since only hammer needs to build on these older distros, this fix only affects the deb building process for those two releases(since autoconf detects that LTTng is broken).

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #7187 from dachary/wip-13831-hammer
Loic Dachary [Fri, 29 Jan 2016 03:21:43 +0000 (10:21 +0700)]
Merge pull request #7187 from dachary/wip-13831-hammer

hammer: init script reload doesn't work on EL7

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agolibrbd: ImageWatcher shouldn't block the notification thread 7407/head
Jason Dillaman [Thu, 28 Jan 2016 19:38:20 +0000 (14:38 -0500)]
librbd: ImageWatcher shouldn't block the notification thread

Blocking the notification thread will also result in librados async
callbacks becoming blocked (since they use the same thread).

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 7e2019a72733dff43e55c9b22df12939d584f87d)

 Conflicts:
src/librbd/ImageWatcher.[cc|h]: fewer RPC messages

9 years agolibrados_test_stub: watch/notify now behaves similar to librados
Jason Dillaman [Thu, 28 Jan 2016 19:35:54 +0000 (14:35 -0500)]
librados_test_stub: watch/notify now behaves similar to librados

Notifications are executed via the same librados AIO callback
thread, so it's now possible to catch deadlock.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 43722571838a2d78ca8583b5a1ea381cd988de0b)

9 years agotests: simulate writeback flush during snap create
Jason Dillaman [Thu, 28 Jan 2016 17:40:18 +0000 (12:40 -0500)]
tests: simulate writeback flush during snap create

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit e9570fcf4be9cd5c06937769d074fa52ffb32e4b)

9 years agoMerge pull request #7365 from liewegas/wip-tcmalloc-hammer
Sage Weil [Tue, 26 Jan 2016 15:12:29 +0000 (10:12 -0500)]
Merge pull request #7365 from liewegas/wip-tcmalloc-hammer

osd: pass tcmalloc env through to ceph-osd

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoupstart/ceph-osd.conf: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through 7365/head
Sage Weil [Tue, 26 Jan 2016 13:43:15 +0000 (08:43 -0500)]
upstart/ceph-osd.conf: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through

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

9 years agoinit-ceph: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through
Sage Weil [Wed, 20 Jan 2016 23:36:08 +0000 (18:36 -0500)]
init-ceph: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through

..when set in the sysconfig/default file.

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

[source default/sysconfig file too]

9 years agotools: ceph-monstore-tool must do out_store.close() 7346/head 7347/head
huangjun [Tue, 21 Apr 2015 06:04:40 +0000 (14:04 +0800)]
tools: ceph-monstore-tool must do out_store.close()

this change fixes the "store-copy" command.
Like the bug reported in http://tracker.ceph.com/issues/10093.

Signed-off-by: huangjun <hjwsm1989@gmail.com>
(cherry picked from commit d85e0f8c50fce62be012506f7ffcb1cdeb0c819c)

9 years agodeb: strip tracepoint libraries from Wheezy/Precise builds 7316/head
Jason Dillaman [Thu, 21 Jan 2016 20:36:37 +0000 (15:36 -0500)]
deb: strip tracepoint libraries from Wheezy/Precise builds

These releases do not (by default) have a sane LTTng-UST environment,
which results in autoconf disabling support for tracing.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7252 from ceph/wip-13483-hammer
Jason Dillaman [Tue, 19 Jan 2016 01:46:07 +0000 (20:46 -0500)]
Merge pull request #7252 from ceph/wip-13483-hammer

qa: remove legacy OS support from rbd/qemu-iotests

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa: disable rbd/qemu-iotests test case 055 on RHEL/CentOS 7252/head
Jason Dillaman [Mon, 18 Jan 2016 20:57:43 +0000 (15:57 -0500)]
qa: disable rbd/qemu-iotests test case 055 on RHEL/CentOS

Fixes: #14385
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa: remove legacy OS support from rbd/qemu-iotests
Jason Dillaman [Thu, 15 Oct 2015 16:44:06 +0000 (12:44 -0400)]
qa: remove legacy OS support from rbd/qemu-iotests

RHEL7 derivatives were failing test 002 since they were using
legacy test cases for now unsupported OSes.

Fixes: #13483
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
9 years agolibrbd: optionally validate RBD pool configuration (snapshot support) 7182/head
Jason Dillaman [Mon, 14 Dec 2015 22:41:49 +0000 (17:41 -0500)]
librbd: optionally validate RBD pool configuration (snapshot support)

Fixes: #13633
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 1fea4dadc60e13518e9ee55d136fbc4e9d3a621e)

Conflicts:
src/common/config_opts.h: trivial resolution

9 years agoconfig_opts: increase suicide timeout to 300 to match recovery 7236/head
Samuel Just [Thu, 14 Jan 2016 16:35:23 +0000 (08:35 -0800)]
config_opts: increase suicide timeout to 300 to match recovery

Fixes: 14376
Backport: hammer, firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7179 from dachary/wip-14287-hammer
Sage Weil [Thu, 14 Jan 2016 14:21:50 +0000 (09:21 -0500)]
Merge pull request #7179 from dachary/wip-14287-hammer

hammer: ReplicatedPG: wrong result code checking logic during sparse_read

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7178 from dachary/wip-14285-hammer
Sage Weil [Thu, 14 Jan 2016 14:20:53 +0000 (09:20 -0500)]
Merge pull request #7178 from dachary/wip-14285-hammer

hammer: osd/OSD.cc: 2469: FAILED assert(pg_stat_queue.empty()) on shutdown

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7177 from dachary/wip-14043-hammer
Sage Weil [Thu, 14 Jan 2016 14:20:34 +0000 (09:20 -0500)]
Merge pull request #7177 from dachary/wip-14043-hammer

hammer: osd/PG.cc: 288: FAILED assert(info.last_epoch_started >= info.history.last_epoch_started)

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7180 from dachary/wip-14288-hammer
Sage Weil [Thu, 14 Jan 2016 14:20:10 +0000 (09:20 -0500)]
Merge pull request #7180 from dachary/wip-14288-hammer

hammer: ceph osd pool stats broken in hammer

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6994 from badone/wip-13993-hammer
Sage Weil [Thu, 14 Jan 2016 14:19:18 +0000 (09:19 -0500)]
Merge pull request #6994 from badone/wip-13993-hammer

log: Log.cc: Assign LOG_DEBUG priority to syslog calls

Reviewed-by: Sage Weil <sage@redhat.com>