Commit Graph

38789 Commits

Author SHA1 Message Date
Sage Weil
243860b5e4 Merge pull request #3125 from ceph/wip-10194-master
Wip 10194 master

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-29 15:06:11 -08:00
Sage Weil
2980f3ac52 Merge branch 'prio_hb_pkts' of git://github.com/wenjianhn/ceph
Conflicts:
	src/msg/Messenger.h
2015-01-29 13:28:26 -08:00
Sage Weil
7237933f6c Merge pull request #3543 from ceph/wip-hints
librados: rename NOREUSE to NOCACHE

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-01-29 13:06:29 -08:00
Sage Weil
0e0e3e49c4 Merge pull request #3295 from majianpeng/fix2
osd: add per-pool fadvise-dontneed flag

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-29 13:04:39 -08:00
Sage Weil
b29167c6c0 Merge pull request #3392 from ceph/wip-crush-straw2
crush: new straw2 bucket

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-29 13:03:39 -08:00
Sage Weil
e41c052103 Merge pull request #3495 from XinzeChi/wip-size-empty
cleanup: replace some size() or length() with !empty() 

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-29 13:03:04 -08:00
Sage Weil
89bd6b1324 librados: rename NOREUSE to NOCACHE
As far as I can tell, the posix_fadvise() distinction between WONTNEED and
NOREUSE is subtle: one says I won't access the data, and the other says
I will access it one more time and then not access it.  That is, the
distinction is about time.  This thread seems to confirm this
interpretation:

 https://lkml.org/lkml/2011/6/27/44

Since we are attaching hints to the IO operations themselves, this
distinction doesn't make much sense for us.  (Backends should be careful
about which hint they use; or rather, they should use WONTNEED *after*
doing the IO since NOREUSE is presenting a no-op in Linux.)

However, we want to make a totally different distinction:

 WONTNEED - nobody will access this -> drop it from the cache
 NOCACHE  - *i* won't access this again -> don't let me affect your caching
            decisions or the working set you're maintaining for other
            clients.

The NOCACHE name is made-up and distinct from NOREUSE only so that it is
different from POSIX and doesn't introduce confusion for people familiar
with the POSIX meaning.  Perhaps a more accurate name would be IWONTNEED
but that is only one character apart and too error-prone IMO.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-29 13:00:15 -08:00
Samuel Just
cd2491a10a Merge pull request #3540 from athanatos/wip-sam-cache-object-context-across-op
Wip sam cache object context across op

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-29 10:39:28 -08:00
Sage Weil
880f94895f Merge pull request #3536 from athanatos/wip-10616
Wip 10616

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-29 10:18:44 -08:00
Yehuda Sadeh
4feb8644d3 rgw: reuse fcgx connection structure
Fixes: #10194

Reuse the fcgx connection structure. It forces FCGX_Accept_r() freeing
up or reusing the connection if possible. This is needed for certain
fastcgi module (mod-proxy-fcgi) that sets the FCGI_KEEP_CONN, which
prevents the connection from being closed when calling FCGX_Finish_r().

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-29 10:09:12 -08:00
Yehuda Sadeh
32b9bb7a2b QueueRing: a reduced contention queue
A queue that provides multi-readers, multi-writers concurrency with a
reduced lock contention.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2015-01-29 10:09:12 -08:00
Josh Durgin
d5c8a57d55 Merge pull request #3524 from ceph/wip-8251-2
Wip 8251 2

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-29 08:54:40 -08:00
Josh Durgin
dd3ad6b9fe Merge pull request #3535 from ceph/wip-librbd-tests
tests: ensure RBD integration tests exercise all features

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-29 08:40:26 -08:00
Sage Weil
b6fa40fe12 Merge pull request #3530 from xinxinsh/wip-cleanup
cleanup : remove unused perf counter
2015-01-29 07:19:36 -08:00
Loic Dachary
c2c7f9fe58 Merge pull request #3528 from RobertJansen1/patch-1
corrected some confusing numbers

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-29 11:15:40 +01:00
RobertJansen1
0a998f51f2 edited failure conclusion
Signed-off-by: Robert Jansen <r.jansen@fairbanks.nl>
2015-01-29 11:07:50 +01:00
RobertJansen1
4527e8f8eb corrected some confusing numbers
Signed-off-by: Robert Jansen <r.jansen@fairbanks.nl>
2015-01-29 11:03:14 +01:00
xinxin shu
a66898fc68 cleanup : remove unused perf counter
Signed-off-by: xinxin shu <xinxin.shu@intel.com>
2015-01-29 10:16:13 +08:00
Yehuda Sadeh
ca214c96cb rgw: also convert sharded replicalog entries
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-28 16:36:47 -08:00
Yehuda Sadeh
0a4956e20a rgw: get rid of replicalog index_by_instance param
We convert old entries anyway, just complicates everything. Only use
that was kept is the one needed for the conversion function.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-28 16:10:34 -08:00
Yehuda Sadeh
c4a6eabb45 rgw: fixing rebase casualties
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-28 15:56:10 -08:00
Yehuda Sadeh
791c15bddc rgw: convert old replicalog entries if needed
If reading a bucket replicalog entry and one doesn't exist, fall back to
the old key, and convert it to the new one. When updating entries, if
entry does not exist do the same.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-28 15:56:10 -08:00
Yehuda Sadeh
778a53ab70 rgw-admin: add replicalog update command
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-28 15:56:10 -08:00
Gregory Farnum
94bb265243 Merge pull request #3514 from rzarzynski/wip-10550
mds: Wip 10550

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-01-28 14:04:35 -08:00
Sage Weil
5e8981709a Merge pull request #3499 from ceph/wip-perf-filter
common: filtering in `perf dump`

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-28 09:36:36 -08:00
Loic Dachary
c2170bb9b4 Merge pull request #3508 from zhouyuan/submodule_https_git
Update git submodule to use the same https protocol

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-28 16:45:17 +01:00
Jason Dillaman
8d56ade94e tests: ensure RBD integration tests exercise all features
The RBD_FEATURES environment variables was not being exported to
the Python and C++ integration tests.  This resulted in the same
test cases being run multiple times instead of testing different
RBD features.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-28 10:34:48 -05:00
Jian Wen
9b9a682fe0 msg/Pipe: set dscp as CS6 for heartbeat socket
To prioritize the heartbeat packets in the the diffserv-aware device.
Thanks dtaht.
2015-01-28 17:42:20 +08:00
Radoslaw Zarzynski
1e236a3769 mds: don't join on thread which has not been runned.
Fixes: #10550
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2015-01-28 10:28:43 +01:00
Yuan Zhou
6939e8c5fa Update git submodule to use the same https protocol
Make more convenient for hosts with git protocol blocked

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
2015-01-28 14:23:12 +08:00
Sage Weil
0c5e45802b Merge pull request #3505 from ceph/wip-fuse-regress-note
Update PendingReleaseNotes for ceph-fuse change in Giant
2015-01-27 17:16:41 -08:00
Yehuda Sadeh
8d0295cbb6 rgw: extend replica log api (purge-all)
Adding a new purge-all option for the replica log api, which completely
removes a replica log object.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2015-01-27 16:32:02 -08:00
Yehuda Sadeh
6b0151c487 utime: extend utime parsing
Since we sometimes encode it as <sec>.<usec>, also try to parse it using
this format.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2015-01-27 16:25:00 -08:00
Yehuda Sadeh
e274e10970 rgw: fix replica log indexing
Fixes: #8251

Previously we were indexing the replica log only by bucket name, even
though we were provided with the bucket instance id. Fix that, and also
add the option to be able to revert to the old behavior. For
radosgw-admin we can do it if --replicalog-index-by-instance=false is
provided. For the replica log REST api we now have the index-by-instance
http param (defaults to true).

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2015-01-27 16:24:59 -08:00
Sage Weil
a3eedc2a86 Merge pull request #3480 from liewegas/wip-10617
osd: continue interrupted pg deletion on pool removal (bug 10617)

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-01-27 13:04:38 -08:00
Sage Weil
8b22bf6cec Merge pull request #3454 from hjwsm1989/optracker-op-wq
use shardid as a key of the shardinfo when "dump_op_pq_state".

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-27 12:58:29 -08:00
Sage Weil
533b458966 Merge pull request #3430 from majianpeng/misc
Misc

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-27 12:57:36 -08:00
Sage Weil
74e584b258 Merge pull request #3311 from xinxinsh/fix1
disable tcmalloc by default when enable jemalloc

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-27 12:56:00 -08:00
Sage Weil
496a37e665 Merge pull request #3394 from ceph/wip-10555
mon: Do not allow empty pool names when creating

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-27 12:55:11 -08:00
Greg Farnum
0be7925a95 Update PendingReleaseNotes for ceph-fuse change in Giant
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2015-01-27 12:55:04 -08:00
Sage Weil
4d3c7ecc9d Merge pull request #3444 from ceph/wip-mon-pgtemp
osd: OSDMap: remove pg temps for inexistent pools

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-27 12:54:47 -08:00
Sage Weil
f1c9b24fe7 Merge pull request #3465 from liewegas/wip-mon-features
mon/OSDMonitor: validate crush features for osd (not just mon)

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
2015-01-27 12:54:28 -08:00
Sage Weil
597c18ad46 Merge pull request #3475 from tchaikov/osdmap-remove-unused-variables
osd/OSDMap: remove unused variables

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-27 12:54:03 -08:00
Sage Weil
dba0abbd68 Merge pull request #3477 from liewegas/wip-noreuse
librados: add NOREUSE fadvise hint

Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-01-27 12:53:30 -08:00
Yehuda Sadeh
fc896760ff Merge pull request #3471 from yuandong1222/rgw-format-mtime
rgw: format mtime of radosgw-admin bucket stats

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-27 10:23:03 -08:00
Loic Dachary
af266c02d3 Merge pull request #3497 from trociny/test-10439
tests: bring back useful test 'ceph tell osd.foo'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-27 14:12:36 +01:00
John Spray
a8e257975a common: filtering in perf dump
So that we can get out a particular subsystem
or particular counter without dumping
everything.  Should make tests that watch perf
counters much less spammy!

`logger` and `counter` params are used with
an exact comparison here but the interface
should be amenable to extending to e.g. globbing
if we wanted to in the future.

Also tidy up some iterator while()s into for()s.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-01-27 11:17:10 +00:00
Mykola Golub
e5ddc502d9 tests: bring back useful test 'ceph tell osd.foo'
The test was removed in 1189138 (mon: make ceph tell mon.* version
work) as it began to fail due to #10439. After it fixed in c4548f6
(pybind: ceph_argparse: validate incorrectly formed targets), the test
can be restored.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-01-27 10:51:07 +02:00
Xinze Chi
7c59bc0abe cleanup: replace some length() with !empty()
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
2015-01-27 07:33:47 +00:00
Xinze Chi
17add06727 cleanup: replace some size() with !empty()
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
2015-01-27 07:17:44 +00:00