RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 09:57:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,543 Commits 211 Branches 394 Tags 2.2 GiB
796331d6a1
Commit Graph

50543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
796331d6a1 Merge branch 'master' of github.com:ceph/ceph 2016-03-07 15:58:44 -05:00
Sage Weil
37f14a5d94 Merge branch 'wip-conf-root' of https://github.com/liewegas/ceph 
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Conflicts:
	src/common/config.cc
 2016-03-07 15:36:13 -05:00
Josh Durgin
9ef7bb15bd Merge pull request #7914 from dillaman/wip-tests-template-specialization 
test: correct librbd errors discovered with unoptimized cmake build

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-07 12:07:51 -08:00
Sage Weil
216967d60b Merge pull request #7628 from liewegas/wip-journal-block-size 
os/filestore/FileJournal: set block size via config option

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
 2016-03-07 12:28:22 -05:00
Sage Weil
f78d7e8b6d Merge pull request #7705 from renhwsky/renhw-wip-pgmonitor-get_rule_avail 
mon/pgmonitor: use appropriate forced conversions in get_rule_avail
 2016-03-07 12:27:40 -05:00
Sage Weil
3634ed52f8 Merge pull request #7775 from branch-predictor/bp-bl-eradication 
os/ObjectStore: implement more efficient get_encoded_bytes()

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-07 12:27:07 -05:00
Sage Weil
b62add00a0 Merge pull request #7845 from aiicore/pthread_setname_fix 
common: set thread name from correct thread

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-07 12:25:13 -05:00
Sage Weil
6fc5c46097 Merge pull request #7850 from jupiturliu/kstore-latency 
osd: kstore: latency breakdown

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-07 12:24:40 -05:00
Sage Weil
3a72d21e30 Merge pull request #7861 from tchaikov/wip-14910 
qa/workunits/cephtool/test.sh: wait longer in ceph_watch_start()

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-07 12:23:46 -05:00
Sage Weil
020c78940e Merge pull request #7863 from branch-predictor/bp-faster-name-gen 
common/obj_bencher.cc: faster object name generation

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-07 12:23:06 -05:00
Loic Dachary
80ef3477bf Merge pull request #7954 from SUSE/wip-docdev 
doc/dev: various refinements

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-03-07 23:22:33 +07:00
Nathan Cutler
4a5875a184 doc/dev: start Testing in the cloud chapter 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-03-07 16:00:01 +01:00
Nathan Cutler
37afe5c53b doc/dev: various refinements 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-03-07 10:27:42 +01:00
Kefu Chai
6d31e5dfa8 Merge pull request #7951 from badone/wip-cls_hello-grammar 
cls_hello: Fix grammatical error in description comment

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-07 17:19:29 +08:00
Loic Dachary
7e95acb494 Merge pull request #7946 from SUSE/wip-doc-dev-teuth 
doc/dev: integrate testing into the narrative

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-03-07 10:12:28 +07:00
Brad Hubbard
d6a48d968a cls_hello: Fix grammatical error in description comment 
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
 2016-03-07 12:30:11 +10:00
Nathan Cutler
5b570653f5 doc/dev: integrate testing into the narrative 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-03-06 20:41:35 +01:00
Yehuda Sadeh
6018ccd6c4 Merge pull request #7862 from theanalyst/rgw/doc-insecure-keystone 
doc: rgw explain keystone's verify ssl switch

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-05 09:29:46 -08:00
Yehuda Sadeh
a794ea5f7e Merge pull request #7887 from cbodley/wip-rgw-test-multi-period 
test/rgw: add multisite test for meta sync across periods

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-05 09:25:27 -08:00
Yehuda Sadeh
2286463b15 Merge pull request #7827 from cbodley/wip-rgw-period-meta-logs 
rgw: fixes for per-period metadata logs

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-05 09:25:01 -08:00
Loic Dachary
a9493f23ce Merge pull request #7941 from SUSE/wip-teuos-intro 
doc: detailed description of bugfixing workflow

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-03-05 21:55:13 +07:00
Nathan Cutler
a0572bc55c doc: detailed description of bugfixing workflow 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-03-05 15:54:09 +01:00
Loic Dachary
19f6c8d488 Merge pull request #7933 from ceph/wip-doc-dist-ceph-detect-init 
doc: add ceph-detect-init(8) source to dist tarball

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-03-05 08:09:36 +07:00
Josh Durgin
56ca57329b Merge pull request #7937 from saru95/patch--1 
ceph_daemon.py: Resolved ImportError to work with python3

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-04 14:45:12 -08:00
Zack Cerza
28cc0ca66d Merge pull request #7936 from ceph/wip-fix-debian-build 
debian/changelog: Remove stray 'v' in version
 2016-03-04 15:12:37 -07:00
Sarthak Munshi
9e47cef30c ceph_daemon.py: Resolved ImportError to work with python3 
Signed-off-by: Sarthak Munshi <sarthakmunshi@gmail.com>
 2016-03-05 03:35:50 +05:30
Casey Bodley
9a6771a864 rgw: fix for RGWCoroutinesManager::run() return value 
the 'int ret' variable of the inner scope was shadowing an 'int ret'
variable in the outer scope, so we weren't propagating any of the error
codes

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-03-04 17:04:09 -05:00
Casey Bodley
5434db9335 rgw: use current period for InitSyncStatus 
the InitSyncStatus coroutine records the position to start incremental
sync after finishing a full sync.  this should be the master's marker
from the current period, rather than its oldest log period

this also adds a check to run_sync() that restarts a full sync if it
sees that our sync period is behind the master's oldest log period

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-03-04 17:04:09 -05:00
Casey Bodley
762c075bb2 rgw: meta log rest handlers avoid get_log() 
RGWMetadataManager::get_log() will allocate a log and keep it in memory.
this could lead to a potential denial of service by making requests with
lots of different period ids

RGWMetadataLog if effectively stateless (the only state is a set of
modified_shards, which are not touched by any of the rest api calls), so
we can use a temporary instead of calling get_log()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-03-04 17:04:09 -05:00
Casey Bodley
faa60bc1a9 rgw: pull first log period from master if not found locally 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-03-04 17:04:09 -05:00
Casey Bodley
1353fe514b rgw: implement find_oldest_log_period for RGWMetadataManager 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-03-04 17:04:09 -05:00
Casey Bodley
1b4d1e303b rgw: period history behaves with no current_period 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-03-04 17:04:08 -05:00
Casey Bodley
8044dcb048 rgw: initialize async_rados before meta_mgr 
RGWMetadataManager::init() will depend on async_rados

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-03-04 17:04:08 -05:00
Casey Bodley
f8804b34a4 rgw: make RGWMetadataLog::get_shard_oid public and const 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-03-04 17:04:08 -05:00
Casey Bodley
b8a4a9d9a4 rgw: add RGWStatObjCR for async raw_obj_stat 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-03-04 17:04:08 -05:00
Casey Bodley
dbb934056b rgw: only write meta sync shard markers if can_adjust_marker 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-03-04 17:04:08 -05:00
Casey Bodley
873cf39882 rgw: make RGWMetaSyncCR wakeups thread-safe 
now that the shards will be coming and going after startup, they need to
be reference counted and protected by a mutex

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-03-04 17:04:08 -05:00
Casey Bodley
da5f3e7e37 rgw-admin: add read_current_period_id() helper function 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-03-04 17:04:08 -05:00
Dan Mick
0f7730c8f4 debian/changelog: Remove stray 'v' in version 
Signed-off-by: Dan Mick <dan.mick@redhat.com>
 2016-03-04 11:42:08 -08:00
Orit Wasserman
ede8deeb46 Merge pull request #7918 from ceph/wip-rgw-payer-yehuda 
rgw: link payer info to usage logging

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2016-03-04 19:37:21 +01:00
Ken Dreyer
c8ec17aa1d doc: add ceph-detect-init(8) source to dist tarball 
Prior to this commit, the tarball from "make dist" did not include the
ceph-detect-init(8) man page rST source.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
 2016-03-04 09:35:46 -07:00
Orit Wasserman
d720540eef Merge pull request #7929 from yehudasa/wip-submodules-fix 
submodules: revert an accidental change

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2016-03-04 16:47:22 +01:00
Samuel Just
fc88f488ce Merge pull request #7910 from ceph/wip-14955 
buffer: increment history alloc as well in raw_combined

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-04 07:02:47 -08:00
Yehuda Sadeh
2f7d1c9d2c submodules: revert an accidental change 
revert changes that went in in commit f1ac0de5bf.
This affects ceph-erasure-code-corpus, civetweb

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-04 06:54:49 -08:00
Orit Wasserman
2fe0f8eb54 Merge pull request #7916 from ceph/wip-14975 
rgw: adjust error code when bucket does not exist in copy operation
rgw: don't override error when initializing zonegroup

Fixes: #14975

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2016-03-04 12:25:37 +01:00
Javier M. Mellid
4727d4261d rgw: avoid showing payer when payer == owner 
If the payer matches the owner it shows the owner only.

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
 2016-03-03 16:07:39 -08:00
Yehuda Sadeh
155a53d649 Merge pull request #7786 from ceph/wip-rgw-indexless 
rgw: indexless buckets (Yehuda Sadeh)

 - can define a policy, for which buckets are indexless
 - users can then create buckets under the specified placement target
 - indexless buckets will not be synced across zones
 - does not work with (s3) versioned buckets

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-03 14:18:25 -08:00
Yehuda Sadeh
b7d022f61a rgw: indexless buckets 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-03 14:06:19 -08:00
Yehuda Sadeh
f1ac0de5bf rgw: configurable index type 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-03 14:04:19 -08:00
Yehuda Sadeh
905b1d9aa9 rgw: don't override error when initializing zonegroup 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-03 13:56:37 -08:00