]>
git.apps.os.sepia.ceph.com Git - ceph.git/log 
John Spray  [Thu, 23 Mar 2017 13:07:32 +0000  (09:07 -0400)] 
mds: include advisory `path` field in damage
This will just be whatever path we were looking
at at the point that damage was notified -- no
intention whatsoever of providing any up to date
path or resolution when there are multiple paths
to an inode.
Fixes: http://tracker.ceph.com/issues/18509 
Signed-off-by: John Spray <john.spray@redhat.com> 
(cherry picked from commit 
c0bff51ef409eb6e4b2fc248e06e5a7e43faf51e )
Conflicts:
    src/mds/CDir.cc - omit dout(10) because jewel does not have 
cb86740a 
    src/mds/ScrubStack.cc - jewel does not have 
7b456109  which changed
       in->make_path_string_projected() call to in->make_path_string() but
       it's moot because that line is dropped
John Spray  [Mon, 19 Sep 2016 19:25:58 +0000  (20:25 +0100)] 
mds: populate DamageTable from scrub and log more quietly
Fixes: http://tracker.ceph.com/issues/16016 
Signed-off-by: John Spray <john.spray@redhat.com> 
(cherry picked from commit 
9c82040b1a762a3498c6794a29a43b3866f30dab )
John Spray  [Mon, 19 Sep 2016 17:26:42 +0000  (18:26 +0100)] 
mds: tidy up ScrubHeader
Signed-off-by: John Spray <john.spray@redhat.com> 
(cherry picked from commit 
111d2cf2d8504cd4486180a95e52f253018364b3 )
Conflicts:
	src/mds/CInode.cc (jewel does not have 
5259683e7819c22c14b21b1dd678a33e14574f21 )
John Spray  [Mon, 19 Sep 2016 16:35:54 +0000  (17:35 +0100)] 
mds: remove redundant checks for null ScrubHeader
This was originally optional but now all the paths
that kick off a scrub should be going through
enqueue_scrub and thereby getting a header set.
Signed-off-by: John Spray <john.spray@redhat.com> 
(cherry picked from commit 
0c890282699f877f42870408d674ec1e9f9322a3 )
Conflicts:
	src/mds/CInode.cc (jewel does not have 
5259683e7819c22c14b21b1dd678a33e14574f21 )
Michal Jarzabek  [Tue, 11 Oct 2016 20:23:57 +0000  (21:23 +0100)] 
mds/DamageTable: move classes to .cc file
Signed-off-by: Michal Jarzabek <stiopa@gmail.com> 
(cherry picked from commit 
96018b0a85d0bc7eec285398dd596ee01d16fae7 )
John Spray  [Wed, 14 Jun 2017 14:01:27 +0000  (10:01 -0400)] 
Merge pull request #14672 from smithfarm/wip-19334-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:43:05 +0000  (09:43 -0400)] 
Merge pull request #14677 from smithfarm/wip-19665-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:35:08 +0000  (09:35 -0400)] 
Merge pull request #15466 from smithfarm/wip-19762-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:32:47 +0000  (09:32 -0400)] 
Merge pull request #14700 from smithfarm/wip-19709-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:31:22 +0000  (09:31 -0400)] 
Merge pull request #14685 from smithfarm/wip-19675-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:30:53 +0000  (09:30 -0400)] 
Merge pull request #14684 from smithfarm/wip-19673-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:30:13 +0000  (09:30 -0400)] 
Merge pull request #14683 from smithfarm/wip-19671-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:29:50 +0000  (09:29 -0400)] 
Merge pull request #14682 from smithfarm/wip-19668-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:27:13 +0000  (09:27 -0400)] 
Merge pull request #14679 from smithfarm/wip-19666-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:26:40 +0000  (09:26 -0400)] 
Merge pull request #14676 from smithfarm/wip-19619-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:24:38 +0000  (09:24 -0400)] 
Merge pull request #14674 from smithfarm/wip-19482-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:23:27 +0000  (09:23 -0400)] 
Merge pull request #14671 from smithfarm/wip-19044-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:23:13 +0000  (09:23 -0400)] 
Merge pull request #14670 from smithfarm/wip-18949-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:22:28 +0000  (09:22 -0400)] 
Merge pull request #14669 from smithfarm/wip-18900-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:21:43 +0000  (09:21 -0400)] 
Merge pull request #14668 from smithfarm/wip-18705-jewelReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Tue, 13 Jun 2017 18:05:55 +0000  (19:05 +0100)] 
Merge pull request #14698 from smithfarm/wip-19677-jewelReviewed-by: John Spray <john.spray@redhat.com> 
Abhishek L  [Fri, 9 Jun 2017 17:39:17 +0000  (19:39 +0200)] 
Merge pull request #14766 from smithfarm/wip-19757-jewelReviewed-by: Abhishek Lekshmanan <abhishek@suse.com> Reviewed-by: Casey Bodley <cbodley@redhat.com> 
Abhishek L  [Fri, 9 Jun 2017 17:38:46 +0000  (19:38 +0200)] 
Merge pull request #14787 from linuxbox2/jewel-rgw-shard-limit-ckReviewed-by: Abhishek Lekshmanan <abhishek@suse.com> Reviewed-by: Casey Bodley <cbodley@redhat.com> 
Abhishek L  [Fri, 9 Jun 2017 17:38:23 +0000  (19:38 +0200)] 
Merge pull request #14789 from mdw-at-linuxbox/wip-jewel-rgw-rvkReviewed-by: Abhishek Lekshmanan <abhishek@suse.com> Reviewed-by: Casey Bodley <cbodley@redhat.com> 
Abhishek L  [Fri, 9 Jun 2017 17:36:02 +0000  (19:36 +0200)] 
Merge pull request #14815 from smithfarm/wip-19786-jewelReviewed-by: Abhishek Lekshmanan <abhishek@suse.com> Reviewed-by: Casey Bodley <cbodley@redhat.com> 
Nathan Cutler  [Wed, 7 Jun 2017 18:13:15 +0000  (20:13 +0200)] 
Merge pull request #15312 from theanalyst/wip-20078Reviewed-by: Casey Bodley <cbodley@redhat.com> 
Nathan Cutler  [Wed, 7 Jun 2017 11:48:06 +0000  (13:48 +0200)] 
Merge pull request #15382 from theanalyst/wip-mem-leak2Reviewed-by: Casey Bodley <cbodley@redhat.com> 
Nathan Cutler  [Sun, 4 Jun 2017 18:39:58 +0000  (20:39 +0200)] 
Client.cc: adjust Client::_getattr callsSigned-off-by: Nathan Cutler <ncutler@suse.com> 
John Spray  [Wed, 15 Mar 2017 19:36:08 +0000  (19:36 +0000)] 
qa/cephfs: use getfattr/setfattr helpers
Signed-off-by: John Spray <john.spray@redhat.com> 
(cherry picked from commit 
dd43d3bc646aeab88486b0963fc83de0b18800c4 )
Conflicts:
        qa/tasks/cephfs/test_data_scan.py: difference in the
            self._mount.run_shell() call in NonDefaultLayout::write (which is
            being dropped by this commit) - in jewel it has "sudo", and in
            master it doesn't
John Spray  [Wed, 22 Jun 2016 12:00:44 +0000  (13:00 +0100)] 
tasks/cephfs: fix race while mounting
This could fail if the mount hadn't finished
coming up.
Signed-off-by: John Spray <john.spray@redhat.com> 
(cherry picked from commit 
adfb757c898a80f18c15dafd02e29840c5931c87 )
John Spray  [Wed, 15 Mar 2017 19:26:30 +0000  (19:26 +0000)] 
qa: add test for reading quotas from different clients
Fixes: http://tracker.ceph.com/issues/17939 
Signed-off-by: John Spray <john.spray@redhat.com> 
(cherry picked from commit 
61617f8f10a6322603a9add77980865cd972ef97 )
John Spray  [Wed, 15 Mar 2017 17:51:44 +0000  (17:51 +0000)] 
client: _getattr on quota_root before using in statfs
...so that after someone adjusts the quota settings
on an inode that another client is using as its mount root,
the change is visible immediately on the other client.
Signed-off-by: John Spray <john.spray@redhat.com> 
(cherry picked from commit 
3d25941aadd223669448d0f5d3c0bd1fefa72308 )
John Spray  [Wed, 15 Mar 2017 15:32:47 +0000  (15:32 +0000)] 
client: getattr before read on ceph.* xattrs
Previously we were returning values for quota, layout
xattrs without any kind of update -- the user just got
whatever happened to be in our cache.
Clearly this extra round trip has a cost, but reads of
these xattrs are fairly rare, happening on admin
intervention rather than in normal operation.
Fixes: http://tracker.ceph.com/issues/17939 
Signed-off-by: John Spray <john.spray@redhat.com> 
(cherry picked from commit 
532dc4b68e538c189ef828f67cecd0d647a62250 )
David Zafman  [Fri, 2 Jun 2017 16:54:22 +0000  (09:54 -0700)] 
Merge pull request #15416 from dzafman/wip-20126Reviewed-by: Josh Durgin <jdurgin@redhat.com> 
David Zafman  [Wed, 31 May 2017 22:39:19 +0000  (15:39 -0700)] 
osd: Object level shard errors are tracked and used if no auth available
Shards with object mismatch are tracked to mark them inconsistent
Fix test because storing omap_digest in object_info not behaving as before
Fixes: http://tracker.ceph.com/issues/20089 
Signed-off-by: David Zafman <dzafman@redhat.com> 
(cherry picked from commit 
1cacbea763c7aabfeaaf4bd5e878301044184117 )
Conflicts:
	src/test/osd/osd-scrub-repair.sh (no alloc_hint in object_info)
weiqiaomiao  [Wed, 1 Jun 2016 09:20:49 +0000  (17:20 +0800)] 
rgw:fix memory leaks
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn> 
(cherry picked from commit 
73e5be2b6133cf4caa0e5e5c8c9eae748b785dbf )
Sage Weil  [Tue, 30 May 2017 14:39:47 +0000  (09:39 -0500)] 
Merge pull request #15360 from liewegas/wip-jewel-master-mixedReviewed-by: Kefu Chai <kchai@redhat.com> 
Sage Weil  [Tue, 30 May 2017 13:58:09 +0000  (09:58 -0400)] 
qa/workunits/rados/test-upgrade-*: whitelist tests for masterSigned-off-by: Sage Weil <sage@redhat.com> 
Nathan Cutler  [Sat, 27 May 2017 07:21:44 +0000  (09:21 +0200)] 
Merge pull request #15208 from liewegas/wip-sortbitwise-jewelReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Nathan Cutler  [Sat, 27 May 2017 00:46:55 +0000  (02:46  +0200)] 
Merge pull request #14851 from yehudasa/wip-rgw-support-ragweed-jewelReviewed-by: Nathan Cutler <ncutler@suse.com> 
Yehuda Sadeh  [Tue, 23 Aug 2016 17:22:42 +0000  (10:22 -0700)] 
rgw: rest conn functions cleanup, only append zonegroup if not empty
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com> 
(cherry picked from commit 
4e41af19846db75081cb0ddb7b33dc2bb9321ace )
Karol Mroz  [Thu, 17 Mar 2016 09:32:14 +0000  (10:32 +0100)] 
rgw: rest and http client code to use param vectors
Replaces param/header lists with vectors. In these cases, we're only ever
adding to the back of the list, so a vector should be more efficient.
Also moves param_pair_t/param_vec_t higher up the include chain for
cleaner function signatures.
Signed-off-by: Karol Mroz <kmroz@suse.com> 
(cherry picked from commit 
d4a2527872e0f5c3ae2874bb7d0ff459ae83cfd4 )
Conflicts:
	src/rgw/rgw_http_client.cc
trivial ws conflict on rebase
Alfredo Deza  [Thu, 25 May 2017 16:45:30 +0000  (12:45 -0400)] 
Merge pull request #14765 from smithfarm/wip-18972-jewelReviewed-by: Alfredo Deza <adeza@redhat.com> 
Sage Weil  [Wed, 24 May 2017 13:48:11 +0000  (09:48 -0400)] 
qa/suites/rados/singleton-nomsgr/*: set sortbitwise after upgradeSigned-off-by: Sage Weil <sage@redhat.com> 
huanwen ren  [Tue, 27 Dec 2016 10:54:45 +0000  (10:54 +0000)] 
mon/OSDMonitor: fixup sortbitwise flag warning
"ceph -s" does not report warning when using
command "ceph osd unset sortbitwise" to drop
sortbitwise flag.
we should use "osdmap.get_up_osd_features() &
CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT"
instead of "(osdmap.get_features(CEPH_ENTITY_TYPE_OSD, NULL) &
CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT)",
because osdmap.get_features only get local "features"
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn> 
(cherry picked from commit 
c25ee187e28724846d0011cd8145e16956d3636e )
Sage Weil  [Tue, 1 Nov 2016 16:09:57 +0000  (12:09 -0400)] 
mon: remove config option to disable no sortbitwise warning
We'll require this soon.
Signed-off-by: Sage Weil <sage@redhat.com> 
(cherry picked from commit 
04e3319e8aecde9ca58ccb7c89016f9079c7d657 )
Nathan Cutler  [Wed, 17 May 2017 07:29:21 +0000  (09:29 +0200)] 
Merge pull request #13450 from dreamhost/wip-18887-jewelReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Robin H. Johnson  [Thu, 4 May 2017 05:31:40 +0000  (22:31 -0700)] 
msg/simple/Pipe: manual backport of fix in PR#14795
Manual backport of errno fixup from PR#14795
(
6f1037e22c2a304795895498cdc955e0ef80f8e3 ), as noted by
https://github.com/ceph/ceph/pull/13450#discussion_r114696885.
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com> 
Nathan Cutler  [Wed, 3 May 2017 11:04:27 +0000  (13:04 +0200)] 
Merge pull request #14667 from smithfarm/wip-18699-jewelReviewed-by: Gregory Farnum <gfarnum@redhat.com> 
Nathan Cutler  [Wed, 3 May 2017 08:33:24 +0000  (10:33 +0200)] 
Merge pull request #14332 from shinobu-x/wip-19396-jewelReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Nathan Cutler  [Wed, 3 May 2017 08:32:37 +0000  (10:32 +0200)] 
Merge pull request #14204 from dzafman/wip-18533-jewelReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Nathan Cutler  [Wed, 3 May 2017 08:31:38 +0000  (10:31 +0200)] 
Merge pull request #13884 from shinobu-x/wip-19119-jewelReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Nathan Cutler  [Wed, 3 May 2017 08:30:32 +0000  (10:30 +0200)] 
Merge pull request #13647 from mslovy/wip-19083-jewelReviewed-by: Gregory Farnum <gfarnum@redhat.com> 
Nathan Cutler  [Fri, 28 Apr 2017 08:24:35 +0000  (10:24 +0200)] 
Merge pull request #14791 from smithfarm/wip-19774-jewelReviewed-by: Sage Weil <sage@redhat.com> 
Nathan Cutler  [Fri, 28 Apr 2017 08:23:45 +0000  (10:23 +0200)] 
Merge pull request #14763 from smithfarm/wip-19562-jewelReviewed-by: Sage Weil <sage@redhat.com> 
Yehuda Sadeh  [Mon, 9 Jan 2017 21:04:43 +0000  (13:04 -0800)] 
rgw: new rest api to retrieve object layout
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com> 
(cherry picked from commit 
2768583dc486109e49d209243675b99fdd39e92c )
Yehuda Sadeh  [Thu, 5 Jan 2017 21:47:24 +0000  (13:47 -0800)] 
rgw: rest api to read zone config params
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com> 
(cherry picked from commit 
a220a2efbfd675e6abf14ae33c21005bcbf6dadf )
Nathan Cutler  [Thu, 27 Apr 2017 19:46:41 +0000  (21:46 +0200)] 
Merge pull request #14481 from dillaman/wip-19468-jewelReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Nathan Cutler  [Thu, 27 Apr 2017 19:05:11 +0000  (21:05 +0200)] 
Merge pull request #14666 from smithfarm/wip-19612-jewelReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Nathan Cutler  [Thu, 27 Apr 2017 19:04:27 +0000  (21:04 +0200)] 
Merge pull request #14664 from smithfarm/wip-19325-jewelReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Nathan Cutler  [Thu, 27 Apr 2017 18:46:08 +0000  (20:46 +0200)] 
Merge pull request #14694 from ceph/wip-bp-systemdReviewed-by: Nathan Cutler <ncutler@suse.com> 
Nathan Cutler  [Thu, 27 Apr 2017 06:44:26 +0000  (08:44 +0200)] 
Merge pull request #13544 from shinobu-x/wip-18932-jewelReviewed-by: Kefu Chai <kchai@redhat.com> 
David Zafman  [Tue, 21 Mar 2017 00:28:45 +0000  (17:28 -0700)] 
filestore, tools: Fix logging of DBObjectMap check() repairs
Signed-off-by: David Zafman <dzafman@redhat.com> 
(cherry picked from commit 
1704f62c0831e6b07138f7dd14a89fef3c9ed2c1 )
David Zafman  [Fri, 3 Mar 2017 23:04:02 +0000  (15:04 -0800)] 
osd: Simplify DBObjectMap by no longer creating complete tables
Bump the version for new maps to 3
Make clone less efficient but simpler
Add rename operation (use instead of clone/unlink)
For now keep code that understands version 2 maps
Signed-off-by: David Zafman <dzafman@redhat.com> 
(cherry picked from commit 
738156a99ed1caf61e5a8230eb8048360056c08e )
No ghobject_t::operator>() so use Kraken cmp_bitwise() instead
Need to use MIN_GHOBJ/MAX_GHOBJ instead of std::min/std::max
David Zafman  [Thu, 16 Feb 2017 00:17:32 +0000  (16:17 -0800)] 
ceph-osdomap-tool: Fix seg fault with large amount of check error output
Signed-off-by: David Zafman <dzafman@redhat.com> 
(cherry picked from commit 
1dda0411f4fbb14ce1e0062da9f14ec3af505d39 )
David Zafman  [Wed, 15 Feb 2017 23:02:33 +0000  (15:02 -0800)] 
osd: Add automatic repair for DBObjectMap bug
Add repair command to ceph-osdomap-tool too
Under some situations the previous rm_keys() code would
generated a corrupt complete table.  There is no way to
figure out what the table should look like now.  By removing
the entries we fix the corruption and aren't much worse off
because the corruption caused some deleted keys to re-appear.
This doesn't breaking the parent/child relationship during
repair because some of the keys may still be contained
in the parent.
Signed-off-by: David Zafman <dzafman@redhat.com> 
(cherry picked from commit 
4cd3c74c928a32e065ed9543d6c91d8718a6ae3d )
Conflicts:
	src/os/filestore/DBObjectMap.h (trivial)
David Zafman  [Wed, 15 Feb 2017 22:59:40 +0000  (14:59 -0800)] 
ceph-osdomap-tool: Fix tool exit status
Signed-off-by: David Zafman <dzafman@redhat.com> 
(cherry picked from commit 
666f14ed90655a2d1bedde8561949625db7a9e6c )
Samuel Just  [Fri, 10 Feb 2017 23:51:42 +0000  (15:51 -0800)] 
DBObjectMap: rewrite rm_keys and merge_new_complete
Leverage the updated in_complete_region and needs_parent to simplify
these methods.
Signed-off-by: Samuel Just <sjust@redhat.com> 
(cherry picked from commit 
c4dffb68eaafe724f7fdae93a4285a7f8003ea29 )
Samuel Just  [Fri, 10 Feb 2017 23:50:57 +0000  (15:50 -0800)] 
DBObjectMap: strengthen in_complete_region post condition
Previously, in_complete_region didn't guarantee anything about
where it left complete_iter pointing.  It will be handy for
complete_iter to be pointing at the lowest interval which ends
after to_test.  Make it so.
Signed-off-by: Samuel Just <sjust@redhat.com> 
(cherry picked from commit 
97b35f4d7d4862da4b6f50ecaef0d292a671fd04 )
Samuel Just  [Fri, 10 Feb 2017 23:48:57 +0000  (15:48 -0800)] 
DBObjectMap: fix next_parent()
The previous implementation assumed that
lower_bound(parent_iter->key()) always leaves the iterator
on_parent().  There isn't any guarantee, however, that that
key isn't present on the child as well.
Signed-off-by: Samuel Just <sjust@redhat.com> 
(cherry picked from commit 
74a7631d0938d7b44894f022224eab10a90d5cec )
Samuel Just  [Thu, 9 Feb 2017 18:47:59 +0000  (10:47 -0800)] 
test_object_map: add tests to trigger some bugs related to 18533
Signed-off-by: Samuel Just <sjust@redhat.com> 
(cherry picked from commit 
f131dbcf5bb17107c029f942a57e9bf4432a26ee )
David Zafman  [Tue, 14 Feb 2017 20:40:33 +0000  (12:40 -0800)] 
test: Add ceph_test_object_map to make check tests
Signed-off-by: David Zafman <dzafman@redhat.com> 
(cherry picked from commit 
0e97a01bd7291458881ee53cece2d887f6333669 )
David Zafman  [Thu, 9 Feb 2017 02:56:27 +0000  (18:56 -0800)] 
ceph-osdomap-tool: Add --debug and only show internal logging if enabled
Signed-off-by: David Zafman <dzafman@redhat.com> 
(cherry picked from commit 
5fb2b2d13953979e5da9f571ab8c4b0b510b8368 )
David Zafman  [Thu, 9 Feb 2017 02:55:48 +0000  (18:55 -0800)] 
osd: DBOjectMap::check: Dump complete mapping when inconsistency found
Signed-off-by: David Zafman <dzafman@redhat.com> 
(cherry picked from commit 
fcf1e17c645e8fad5216c3e59627c817e5c858c7 )
David Zafman  [Wed, 8 Feb 2017 23:38:51 +0000  (15:38 -0800)] 
test_object_map: Use ASSERT_EQ() for check() so failure doesn't stop testing
Signed-off-by: David Zafman <dzafman@redhat.com> 
(cherry picked from commit 
053a273cbc02d6902a4bb1f11db1ea946498df3a )
David Zafman  [Wed, 8 Feb 2017 18:02:40 +0000  (10:02 -0800)] 
tools: Check for overlaps in internal "complete" table for DBObjectMap
Changed check to return an error count and fix tool error message
Signed-off-by: David Zafman <dzafman@redhat.com> 
(cherry picked from commit 
e5e8eb962db6187ea19b96ba29ac83469c90b4ea )
Conflicts:
	src/os/filestore/DBObjectMap.h (trivial)
David Zafman  [Wed, 8 Feb 2017 17:40:49 +0000  (09:40 -0800)] 
tools: Add dump-headers command to ceph-osdomap-tool
Signed-off-by: David Zafman <dzafman@redhat.com> 
(cherry picked from commit 
f4101591ad701a62fe027c4744ca8ea505f44bdc )
Conflicts:
	src/os/filestore/DBObjectMap.h (trivial)
David Zafman  [Tue, 7 Feb 2017 05:09:42 +0000  (21:09 -0800)] 
tools: Add --oid option to ceph-osdomap-tool
Signed-off-by: David Zafman <dzafman@redhat.com> 
(cherry picked from commit 
2d94889e9ee3359017b1efd560f3557ce03ccee6 )
David Zafman  [Tue, 7 Feb 2017 05:31:18 +0000  (21:31 -0800)] 
osd: Remove unnecessary assert and assignment in DBObjectMap
Fix and add comment(s)
Signed-off-by: David Zafman <dzafman@redhat.com> 
(cherry picked from commit 
937e6a03ea4692cc44d53faa0615f8e808c9eb03 )
snakeAngel2015  [Mon, 18 Jul 2016 06:51:37 +0000  (14:51 +0800)] 
rgw: add suport for creating S3 type subuser of admin rest api
Fixes: http://tracker.ceph.com/issues/16682 
The original code cannot support create s3 type subuser of admin rest api as when i execute the following command:
  ./s3curl.pl --id=personal --put -- http://radosgw.h3c.com:8000/admin/user?subuser\&uid=yrf2\&subuser=yrf2:yrf1\&key-type=s3 -v
it would return msg as follows :
	 < HTTP/1.1 403 Forbidden
	< Date: Thu, 14 Jul 2016 07:04:40 GMT
	* Server Apache/2.4.7 (Ubuntu) is not blacklisted
	< Server: Apache/2.4.7 (Ubuntu)
	< x-amz-request-id: tx00000000000000006608f-
0057873988 -8551-slave
	< Accept-Ranges: bytes
	< Content-Length: 114
	< Content-Type: application/json
	<
	* Connection #0 to host slave.com left intact
	{"Code":"InvalidAccessKeyId","RequestId":"tx00000000000000006608f-
0057873988 -8551-slave","HostId":"8551-slave-us"}
 But i have modified the codes for support it ,and it will return actual msg as follows :
  "subusers": [
        {
            "id": "yrf2:yrf1",
            "permissions": "<none>"
        }
    ],
    "keys": [
        {
            "user": "yrf2",
            "access_key": "B46PXYFEWUX0IMHGKP8C",
            "secret_key": "2JYxywXizqwiiMd74UXrJdSJMPNlBtYwF5z8rNvh"
        },
        {
            "user": "yrf2:yrf1",
            "access_key": "INO55WXJ7JQ1ZZGSAB6B",
            "secret_key": "GgCKEfF9hArV2hglunbO7KtvKZnbhmsDpqjSj5DL"
        }
    ],
Please check it ,thanks .
Signed-off-by: snakeAngel2015 <li.jieA@h3c.com> 
(cherry picked from commit 
6535f6ad2137ee55bf5531e865c05aa10bd39bd0 )
Nathan Cutler  [Wed, 26 Apr 2017 19:32:31 +0000  (21:32 +0200)] 
Merge pull request #14809 from tchaikov/wip-18193-jewelReviewed-by: Nathan Cutler <ncutler@suse.com> 
Nathan Cutler  [Wed, 26 Apr 2017 19:32:09 +0000  (21:32 +0200)] 
Merge pull request #14701 from smithfarm/wip-18193-jewelReviewed-by: Kefu Chai <kchai@redhat.com> 
Matt Benjamin  [Wed, 26 Apr 2017 18:28:29 +0000  (14:28 -0400)] 
Merge pull request #14776 from linuxbox2/jewel-pullup-civet-chunked
Nathan Cutler  [Wed, 26 Apr 2017 17:32:07 +0000  (19:32 +0200)] 
Merge pull request #14416 from smithfarm/wip-19557-jewelReviewed-by: Kefu Chai <kchai@redhat.com> 
Matt Benjamin  [Tue, 25 Apr 2017 13:44:39 +0000  (09:44 -0400)] 
civetweb:  pullup chunked encoding by MarcusFixes: http://tracker.ceph.com/issues/19736 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com> 
yaoning  [Fri, 24 Jun 2016 01:51:07 +0000  (09:51 +0800)] 
os: make zero values noops for set_alloc_hint() in FileStore
Signed-off-by: yaoning <yaoning@unitedstack.com> 
(cherry picked from commit 
e2ec24f61b55457caccefecd56f9f08b98264802 )
Kefu Chai  [Wed, 26 Apr 2017 14:58:30 +0000  (22:58 +0800)] 
test/librados/tmap_migrate: g_ceph_context->put() upon return
Signed-off-by: Kefu Chai <kchai@redhat.com> 
Conflict: test/librados/tmap_migrate.cc
  this change is not cherry-picked from master, because tmap_migrate was
removed in master. so we are applying the same change in
cb1cda96713b2ec0f6418c4cbe3d964c2020729c  to this test.
Mark Nelson  [Tue, 3 May 2016 14:56:47 +0000  (09:56 -0500)] 
Fix reveresed promote throttle default parameters.
Signed-off-by: Mark Nelson <mnelson@redhat.com> 
(cherry picked from commit 
793ceac2f3d5a2c404ac50569c44a21de6001b62 )
Marcus Watts  [Thu, 13 Apr 2017 09:33:55 +0000  (05:33  -0400)] 
rgw: swift: disable revocation thread if sleep == 0 || cache_size == 0
Keystone tokens can be revoked.  This causes them to fail
validation.  However, in ceph, we cache them.  As long as
they're in the cache we trust them.  To find revoked tokens
there's a call OSI-PKI/revoked but that's only useful for
pki tokens.  Installations using fernet/uuid may not even
have the proper credentials to support the call, in which
case the call blows up in various ways filling up logs
with complaints.
This code makes the revocation thread optional; by disabling it,
the complaints go away.  A further fix is in the works
to use other more modern calls available in modern keystone
installations to properly deal with non-PKI/PKIZ tokens.
(NB: jewel has this logic in src/rgw/rgw_swift.cc not in src/rgw/rgw_keystone.h)
To disable the revocation thread, use at least one of these:
        rgw_keystone_token_cache_size = 0
		using this will cause tokens to be validated on every call.
You may instead want to set
        rgw_keystone_revocation_interval = 0
		using just this will disable the revocation thread,
		but leaves the cache in use.  That avoids the extra
		validation overhead, but means token revocation won't
		work very well.
Fixes: http://tracker.ceph.com/issues/9493 
Fixes: http://tracker.ceph.com/issues/19499 
Signed-off-by: Marcus Watts <mwatts@redhat.com> 
(cherry picked from commit 
003291a8cbca455c0e8731f66759395a0bb1f555 )
Nathan Cutler  [Tue, 25 Apr 2017 19:06:26 +0000  (21:06 +0200)] 
Merge pull request #14686 from smithfarm/wip-19686-jewelReviewed-by: David Zafman <dzafman@redhat.com> 
Matt Benjamin  [Sat, 5 Nov 2016 17:13:47 +0000  (13:13 -0400)] 
rgw: add bucket size limit check to radosgw-admin
The change adds a new list of all buckets x all users, with
fields for bucket name, tenant name, current num_objects,
current num_shards, current objects per shard, and the
corresponding fill_status--the latter consisting of 'OK',
'WARN <n>%', or 'OVER <n>%.'
The warning check is relative to two new tunables.  The threshold
max objects per shard is set as rgw_bucket_safe_max_objects_per_shard,
which defaults to 100K.  The value rgw_bucket_warning_threshold is
a percent of the current safe max at which to warn (defaults to
90% of full).
From review:
* fix indentation (rgw_admin)
* if user a user_id is provided, check only buckets for that user
* update shard warn pct to be pct-of-fill (not 100 - pct-of-fill)
* print only buckets near or over per-shard limit, if --warnings-only
* s/bucket limitcheck/bucket limit check */
* sanity shard limit should be 90, not 10 (because that changed)
* fixes for memleaks and other points found by cbodley
Fixes: http://tracker.ceph.com/issues/17925 
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com> 
(cherry picked from commit 
7bc144ce36fedc16a3dedc54598b0d75fb8c68bc )
Nathan Cutler  [Tue, 25 Apr 2017 15:38:21 +0000  (17:38 +0200)] 
Merge pull request #14605 from asheplyakov/19476-jewelReviewed-by: Casey Bodley <cbodley@redhat.com> 
Nathan Cutler  [Tue, 25 Apr 2017 15:37:16 +0000  (17:37 +0200)] 
Merge pull request #14660 from smithfarm/wip-19478-jewelReviewed-by: Casey Bodley <cbodley@redhat.com> 
Nathan Cutler  [Tue, 25 Apr 2017 15:36:23 +0000  (17:36 +0200)] 
Merge pull request #14607 from asheplyakov/19607-jewelReviewed-by: Casey Bodley <cbodley@redhat.com> 
Nathan Cutler  [Tue, 25 Apr 2017 13:50:26 +0000  (15:50 +0200)] 
Merge pull request #14587 from asheplyakov/19617-jewelReviewed-by: Sage Weil <sage@redhat.com> 
Kefu Chai  [Mon, 5 Dec 2016 12:23:21 +0000  (20:23 +0800)] 
test/ceph_crypto: do not read ceph.conf in global_init()
ForkDeathTest.MD5 expect an empty output while global_init() complains
if ceph.conf is missing if 0 is passed in as the `flags`. this test
passes if ceph.conf is in current working directory, but jenkins does
not prepare this file for this test.
Fixes: http://tracker.ceph.com/issues/18128 
Signed-off-by: Kefu Chai <kchai@redhat.com> 
(cherry picked from commit 
c72a2271a8012a66d7bbccf5766a73da5bb878d6 )
Conflicts:
        src/test/ceph_crypto.cc - jewel does not have
             
5af29540675b674c1985ff98b28a783ed124acf6 
Loic Dachary  [Thu, 8 Dec 2016 11:40:42 +0000  (12:40 +0100)] 
tests: fix erasure-code premature deallocation of cct
The setup function returns before the run function, the cct variable
must be a data member, not a local variable that gets de-allocated
before run() starts.
Signed-off-by: Loic Dachary <loic@dachary.org> 
(cherry picked from commit 
efa1e54362423d4cfd1541fb8c68237b7b9ebbe3 )
Pan Liu  [Thu, 16 Feb 2017 14:17:52 +0000  (22:17 +0800)] 
rbd-nbd: no need create asok file for unmap and list-mapped commands.
Fixes: http://tracker.ceph.com/issues/17951 
Signed-off-by: Pan Liu <liupan1111@gmail.com> 
(cherry picked from commit 
72352653d585ef89043a4ece371b5c0cb3f6f32a )
Jason Dillaman  [Tue, 29 Nov 2016 17:36:00 +0000  (12:36 -0500)] 
rbd-nbd: restart parent process logger after forking
Fixes: http://tracker.ceph.com/issues/18070 
Signed-off-by: Jason Dillaman <dillaman@redhat.com> 
(cherry picked from commit 
29baf254d72cc593572b5a6215360ba51e3be198 )
Kefu Chai  [Wed, 23 Nov 2016 11:45:57 +0000  (19:45 +0800)] 
crushtool: do not release g_ceph_context at exit
it is but a work around of occasionally timeout.
Signed-off-by: Kefu Chai <kchai@redhat.com> 
(cherry picked from commit 
d305cc51b18cbf4b2757bbacb5d43324461306a9 )