RepoMirrors
/
ceph
mirror of https://github.com/ceph/ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
82,306 Commits 210 Branches 394 Tags 1.4 GiB
Commit Graph

82306 Commits

Author SHA1 Message Date
Abhishek Lekshmanan 6ed31c0461 rgw: policy: add_to_iam_env allows empty values 
Since null conditional just allows for presence of a header it makes
sense to allow empty values as well for checking presence of a header

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan 356c27065f rgw: Policy: add support for PutObject with grants conditionals 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan 38bb5c0a33 rgw: policy: support for conditionals in copy obj 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan f2e7054ef0 rgw: policy: add_to_iam_env now supports char* and checks for null 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan 41da34c828 rgw: policy : put object support for x-amz-metadata-directive 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan 9aed1edc98 rgw: policy: support for acl grants cond. in bucket acls as well 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan 11011e264e rgw_op: use has_conditional only when iam_policy exists 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan e3dbb3da1e rgw: support for s3 grants conditional 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan bffa8c623b rgw: rgw_add_to_iam_env has a r-value reference function overload 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan dc9f7edd72 rgw: drop requestobject tag from gperf and keywords 
Since these are dropped at compile time anyway

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan 7cb7c59959 rgw: kill iam_action as a RGWOp member 
since we only use it for verify_permissions, let us kill iam_action as
member of RGWOp class

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan 5fdb2f2263 rgw: policy: support GetObjTags to use policy conditionals 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan 3d5fe3e5b2 drop eval_existing_objtags 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan 01cb3952f6 s3: add tags for ExistingObjectTag IAM conditional only if necessary 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan d2ec50999a rgw_iam_policy: add has_conditional to Policy 
does a linear search of conditional keys and returns if present. Useful
where conditionals specified need an often expensive lookup to add to
the env.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-22 14:47:33 +01:00
Abhishek Lekshmanan 038e410a9b rgw_iam_tags: split into smaller function 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-17 11:28:56 +01:00
Abhishek Lekshmanan c7b6fdbd99 rgw: add support for ExistingObjectTag in DeleteObjectTagging 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-17 11:28:56 +01:00
Abhishek Lekshmanan e66c7ecbc8 rgw: support ExistingObjectTag in GetObjectAcl op 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-17 11:28:56 +01:00
Abhishek Lekshmanan 00113eb0dc rgw: split rgw_iam_eval_existing_objtags to seperate functions 
one for adding tags to env and the other which calls eval, useful for
Ops where we dont need an eval but need it in the env

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-17 11:28:56 +01:00
Abhishek Lekshmanan 91ae0ccc80 rgw: support for ExistingObjectTag for s3:PubObjectAcl 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-17 11:28:56 +01:00
Abhishek Lekshmanan d34294f7ee rgw: support for ExistingObjectTag for PutObjectTagging operation 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-17 11:28:56 +01:00
Abhishek Lekshmanan d8be271a4f rgw_op: add a function to eval ExistingObjTag s3:IAM conditional 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-17 11:28:56 +01:00
Abhishek Lekshmanan acde64c24a rgw_op: add iam action as RGWOp member 
This commit adds iam_action as a member of RGWOp class which allows for
reusing this later when object policies are to be evaluated

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-17 11:28:56 +01:00
Abhishek Lekshmanan 47f10fec1b RGW: IAM: support s3:x-amz-acl conditional for PutACLs 
Support string-like s3:x-amz-acl conditional  for PutACL request. We're
still to support lists for this

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-17 11:28:56 +01:00
Abhishek Lekshmanan 6cb1cc8a86 rgw: add s3 conditions for PutObject IAM policies 
Adding the following s3 conditions for PutObject operation

s3:x-amz-canned-acl (caveat: only strings are supported, we don't
support a list of canned acls yet)
s3:x-amz-copy-source
s3:x-amz-server-side-encryption
s3:x-amz-server-side-encryption-aws-kms-key-id
s3:RequestObjectTag/<key>

A still TODO is to tackle is s3:RequestObjectTagKeys
which supports a list as an argument and
s3:x-amz-grant-<permission> (which should be easier to support)

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-01-17 11:28:56 +01:00
Patrick Donnelly 9478c064d7
Merge PR #19803 into master 
* refs/pull/19803/head:
	mds: get rid of unnecessary if condition

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-16 20:06:37 -08:00
Patrick Donnelly cc710979e3
Merge PR #19837 into master 
* refs/pull/19837/head:
	client: avoid recursive lock in ll_get_vino

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: huanwen ren <ren.huanwen@zte.com.cn>
 2018-01-16 20:06:31 -08:00
Patrick Donnelly bbd23ca4d5
Merge PR #19860 into master 
* refs/pull/19860/head:
	cephfs-journal-tool: add usage help info for header set <field>
	mds: add error log info
	cephfs-journal-tool: add "set pool_id" option

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-16 20:06:26 -08:00
Patrick Donnelly 7a8bd1c994
Merge PR #19891 into master 
* refs/pull/19891/head:
	mds: handle 'inode gets queued for recovery multiple times'
	mds: use elist to track recover queue items

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-16 20:06:21 -08:00
Patrick Donnelly 4412c6b541
Merge PR #19911 into master 
* refs/pull/19911/head:
	cephfs: Switch MIN/MAX for std::min/max and use intarith templates

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-16 20:06:12 -08:00
Kefu Chai 67e5a2f35f
Merge pull request #19876 from theanalyst/build/do-cmake-args 
build: do_cmake: allow ARGS to be overridden

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-17 09:50:26 +08:00
Sage Weil d079916a95
Merge pull request #19433 from liewegas/wip-pg-removal 
osd: put pg removal in op_wq

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2018-01-16 15:44:27 -06:00
Sage Weil d37d966891 osd/PrimaryLogPG: do on_shutdown on removal 
This cleans up our reservations and misc other state in OSDService that
needs to be cleaned up.

Signed-off-by: Sage Weil <sage@redhat.com>
 2018-01-16 14:31:28 -06:00
Sage Weil 617a82c45e osd: track deleted pools' pg_nums for calculating split 
This is needed to determine (quickly) whether PGs have split.  Calling
get_pg_num() on the latest map does not work when the pool has been
deleted from that map.

Signed-off-by: Sage Weil <sage@redhat.com>
 2018-01-16 14:31:28 -06:00
David Zafman 7ccb7b7023
Merge pull request #19850 from dzafman/wip-calc-stats 
osd/PG: re-write of _update_calc_stats and improve pg degraded state

Fixes: http://tracker.ceph.com/issues/20059

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2018-01-16 11:58:49 -08:00
David Zafman 9f103f013c tests: recovery-unfound-found test needs to account for correct misplaced calculations 
The test expected HEALTH_OK when in a state with misplaced objects therefore HEALTH_WARN

Signed-off-by: David Zafman <dzafman@redhat.com>
 2018-01-16 10:52:21 -08:00
Yuri Weinstein 9c2278bbbc
Merge pull request #19613 from qrGitHub/wip-rgw-optimize-bucketLCPrepare 
rgw: optimize function bucket_lc_prepare

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2018-01-16 09:06:21 -08:00
Yuri Weinstein afb35bafec
Merge pull request #19878 from cbodley/wip-rgw-get-omap-keys-cr 
rgw: fix handling of ENOENT in RGWRadosGetOmapKeysCR

Reviewed-by: Adam Emerson <aemerson@redhat.com>
 2018-01-16 09:05:28 -08:00
Yuri Weinstein 36f1dc0f04
Merge pull request #19897 from cbodley/wip-rgw-put-system-obj 
rgw: rgw_put_system_obj takes bufferlist

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2018-01-16 09:04:36 -08:00
Kefu Chai 31f9af83b3
Merge pull request #19945 from tchaikov/wip-deprecated-in-cxx17 
librbd,librados: do not include stdbool.h in C++ headers

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
 2018-01-16 22:16:43 +08:00
Kefu Chai cff35427ef
Merge pull request #19261 from dillaman/wip-22286 
mgr: disconnect unregistered service daemon when report received

Reviewed-By: Kefu Chai <kchai@redhat.com>
 2018-01-16 22:15:47 +08:00
Sage Weil 5f9911bc4a
Merge pull request #19942 from shinobu-x/wip-sk-minmax-ms_async_op_threads 
common: Add min/max of ms_async_op_threads

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-16 07:33:22 -06:00
Sage Weil fdc3f5c24c
Merge pull request #19397 from xxhdx1985126/master 
mon: update PaxosService::cached_first_committed in PaxosService::maybe_trim()

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-16 07:33:09 -06:00
Jason Dillaman aab2defaca
Merge pull request #19822 from trociny/wip-ggate-ceph-globals 
rbd-ggate: fix parsing ceph global options

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
 2018-01-15 08:51:34 -05:00
Kefu Chai 0c38eb87e2
Merge pull request #19673 from zouaiguo/wip_erase_code 
mon/OSDMonitor.cc : set erasure-code-profile to "" when create replicated pools.

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-15 18:34:34 +08:00
Kefu Chai 9a9a00cb3d
Merge pull request #19896 from tchaikov/wip-vive-cxx-17 
msg/simple: s/ceph::size/std::size/

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
 2018-01-15 11:27:28 +08:00
Kefu Chai 1f21f2f3a3
Merge pull request #19870 from liewegas/wip-strip-ceph-base 
debian/rules: strip ceph-base libraries

Reviewed-By: Kefu Chai <kchai@redhat.com>
 2018-01-15 11:24:08 +08:00
Kefu Chai 17dcd13ee5
Merge pull request #18755 from aclamk/wip-reverted-approx-size 
osd/PG: revert approx size

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-15 11:14:45 +08:00
Kefu Chai 7aba57b9b4
Merge pull request #18191 from hjwsm1989/osd-mark-down 
qa/standalone/osd/osd-mark-down: create pool to get updated osdmap faster

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-15 11:09:02 +08:00
Kefu Chai 35a57fab84
Merge pull request #19877 from adamemerson/wip-dencish 
denc cleanups and other fixes

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-15 11:06:12 +08:00