Samuel Just
4abacbe283
Merge pull request #4539 from athanatos/wip-11429
...
OSD: handle the case where we resurrected an old, deleted pg
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-04 16:36:32 -07:00
Gregory Farnum
4f45409531
Merge pull request #4537 from majianpeng/buffer-fix
...
bufferptr: Offset should not beyond raw_length rather than _len.
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-05-04 11:03:08 -07:00
Jianpeng Ma
3034213419
test/bufferlist: add test case for bufferlist::splice.
...
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-05-05 00:11:47 +08:00
Jianpeng Ma
1006adbdfd
bufferptr: Offset should not beyond raw_length rather than _len.
...
Fixes : #11526
Commit dfccd3d19c
2015-05-05 00:05:30 +08:00
Josh Durgin
7da569fd3e
Merge pull request #4514 from majianpeng/rbd
...
misc bugs in librbd
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-05-04 08:32:04 -07:00
Loic Dachary
5fa8fc3243
Merge pull request #4534 from tchaikov/wip-silence-gcc-warning
...
osd: silence gcc -Wparentheses warning
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-04 17:01:41 +02:00
Kefu Chai
9209a8f2cf
osd: silence gcc -Wparentheses warning
...
otherwise we have following warning:
warning: suggest parentheses around operand of ‘!’ or change ‘|’ to
‘||’ or ‘!’ to ‘~’ [-Wparentheses]
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-04 21:49:02 +08:00
Kefu Chai
5a6140f4bf
common/CompatSet: mark FeatureSet member vars private
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-04 21:49:02 +08:00
Jianpeng Ma
1800a996ac
librbd: For format 2, don't forget set objectcache max objects.
...
For format 2, before create object_cache, it call init_layout and set
the max object for object cache.
In the later ictx_refresh, it only set for format1.
Now move set logic after creating object cache.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-05-04 10:55:01 +08:00
Jianpeng Ma
c60212b21a
rbd: updated the 'rbd --help'
...
Now default format is 2. update 'rbd --help'.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-05-04 10:54:00 +08:00
Jianpeng Ma
9d07069acd
librbd: remove the perfcounter l_librbd_aio_rd/write/discard_*.
...
Now for non-aio read/write/discard, the internal implementation used the
related aio function. So we don't differentiate the aio perfcounter from non-aio for
read/write/discard operations.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-05-04 10:25:14 +08:00
Jianpeng Ma
059c0d15bb
librbd: Remove the redundant judgement.
...
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-05-04 10:25:14 +08:00
Jianpeng Ma
e146b04ba2
librbd: Remove the redundant judgement.
...
For ObjectExtent, if length == object_size, it mean length=0.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-05-04 10:25:14 +08:00
Josh Durgin
1de75edb38
Preforker: include acconfig so includers don't have to
...
Fixes build of systests
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-05-01 20:26:34 -07:00
Josh Durgin
fae5157558
Merge pull request #4524 from ceph/wip-remove-fsx-c
...
test: update CMakefile to sync with c44f8e7
2015-05-01 18:48:00 -07:00
Josh Durgin
5afed73df8
Merge pull request #4518 from yuyuyu101/wip-fix-systest-runnable
...
systest_runnable: Use Preforker to do fork
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-05-01 18:43:05 -07:00
Gregory Farnum
217d222383
Merge pull request #4519 from ceph/wip-flush-log
...
Flush cluster log before MDS::damaged
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-05-01 13:58:19 -07:00
Josh Durgin
fd69d5db4b
Merge pull request #4529 from ceph/wip-librbd-open
...
librbd: invoking RBD::open twice will leak memory
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-05-01 13:55:33 -07:00
Gregory Farnum
62d5b39abc
Merge pull request #4511 from yuyuyu101/wip-async-fix-7
...
Wip async fix 7
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-05-01 13:55:12 -07:00
Haomai Wang
72133522c7
atomic_t: change cas to compare_and_swap and return bool
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-02 03:02:31 +08:00
John Spray
a0f96de277
mds: in damaged() call flush_log before ending
...
...so that the clog messages we send before damaged()
actually have a chance to make it to the cluster log.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-05-01 19:37:11 +01:00
John Spray
88037760f0
mon: add MonClient::flush_log
...
A simple reasonable-effort call for emitting
a MLog before shutting down. Used in MDS which
also waits for its beacon to be acked, so due to
message ordering implicitly waits for this to land
too -- no need to implement a waiting log flush
for this use case.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-05-01 19:37:08 +01:00
Gregory Farnum
4b34584398
Merge pull request #4516 from yuyuyu101/wip-fix-libcephfs-crash
...
Wip fix libcephfs crash
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-05-01 11:22:59 -07:00
Jason Dillaman
a5e88fcf11
librbd: invoking RBD::open twice will leak memory
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-05-01 14:21:35 -04:00
Sage Weil
11066a39b8
Merge pull request #4492 from SUSE/wip-suse-firewall
...
packaging: add SuSEfirewall2 service files
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-01 11:14:01 -07:00
Yehuda Sadeh
fb693a3d1a
Merge pull request #4468 from cernceph/swifty
...
Swift: Set Content-Length when requesting/checking Keystone tokens
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-05-01 10:36:53 -07:00
Samuel Just
c6c6b203ef
Merge pull request #4008 from SUSE/wip-tcmalloc-conditionals
...
Conditional-compile against minimal tcmalloc.
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-01 09:34:06 -07:00
Sage Weil
29ee7953c9
Merge pull request #3429 from liewegas/wip-precalc-pgtemp
...
RFC: mon: prime pg_temp when osdmap changes
Reviewed-by: Guang Yang <yguang@yahoo-inc.com>
Tested-by: Zhi (David) Zhang <zhangz@yahoo-inc.com>
2015-05-01 09:24:33 -07:00
Sage Weil
8d596bfa24
Merge branch 'wip-journal-header' of git://github.com/XinzeChi/ceph
...
Conflicts:
src/gmock
2015-05-01 09:22:01 -07:00
Samuel Just
b5fa1607ee
Merge pull request #3474 from majianpeng/fix5
...
buffer: optimize get_contiguous
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-01 09:17:54 -07:00
Sage Weil
a38baa016e
Merge pull request #3896 from ceph/wip-auth
...
auth: optimize crypto key handling, msg sig checks
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-01 09:17:13 -07:00
Sage Weil
eba5956986
Merge pull request #3975 from wonzhq/skip-cache
...
osd: flush/evict op fixes
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-01 09:16:05 -07:00
Sage Weil
cb979eb585
Merge pull request #4362 from XinzeChi/wip-tier-lat
...
osd: misc latency perf counter for tier pool
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-01 09:15:24 -07:00
Sage Weil
b76d0ffd6b
Merge pull request #4393 from majianpeng/copyget-flags
...
For CEPH_OSD_OP_COPY_GET, add a new filed: flags.
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-01 09:15:07 -07:00
Samuel Just
071b07e27f
Merge pull request #3564 from guangyy/wip-10198
...
osd: break the handling of PG removal event into multiple iterations
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-05-01 09:07:20 -07:00
Samuel Just
94a701a553
Merge pull request #3004 from guangyy/wip-10183
...
Add a new tick timer which does not need to hold osd_lock, put sched_scrub to that tick timer
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-05-01 09:01:47 -07:00
Samuel Just
47725aa6d2
Merge pull request #3659 from SUSE/wip-fix-calamari-health
...
Always provide summary for non-healthy cluster.
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-01 08:08:22 -07:00
Samuel Just
8988cb3804
Merge pull request #3702 from mslovy/wip-fineGrain-submitManagerLock
...
FileStore:: queue_transactions, fine-grain submitManager lock
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-01 08:00:56 -07:00
Samuel Just
23ff52f730
Merge pull request #3919 from guangyy/wip-9558
...
osd : populate the needs_recovery_map source fast when only one peer has missing
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-05-01 07:27:26 -07:00
Samuel Just
fbfd50de5b
OSD: handle the case where we resurrected an old, deleted pg
...
Prior to giant, we would skip pgs in load_pgs which were not present in
the current osdmap. Those pgs would eventually refer to very old
osdmaps, which we no longer have causing the assertion failure in 11429
once the osd is finally upgraded to a version which does not skip the
pgs. Instead, if we do not have the map for the pg epoch, complain to
the osd log and skip the pg.
Fixes: 11429
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-05-01 06:38:12 -07:00
Kefu Chai
32b8bf57f0
test: update CMakefile to sync with c44f8e7
...
* remove unused src/test/fsx.c, see
qa/workunits/suites/fsx.sh
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-01 21:03:05 +08:00
Haomai Wang
b7f432808d
systest_runnable: adjust argument to suite Preforker
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-01 20:27:41 +08:00
Haomai Wang
de5717eb9a
ceph_mon: output preforker error message
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-01 15:05:32 +08:00
Haomai Wang
9e1514cff2
Preforker: Add child process exit status check
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-01 15:05:23 +08:00
Haomai Wang
3f969d60cd
systest_runnable: Use Preforker to do fork
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-01 12:55:09 +08:00
Haomai Wang
e0b389ac7b
test_libcephfs: Add tests to cover zero length write
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-01 11:36:09 +08:00
Gregory Farnum
5ea754a7dd
Merge pull request #4493 from ceph/wip-use-get-linux-version
...
use get_linux_version() instead ad-hoc uname().release parsing
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-04-30 13:40:03 -07:00
Haomai Wang
735ab91f3c
Client: Fast return if len is 0
...
If len == 0,
osdc/Striper.cc: 50: FAILED assert(len > 0)
2: (Striper::file_to_extents(CephContext*, char const*, ceph_file_layout const*, unsigned long, unsigned long, unsigned long, std::map<object_t, std::vector<ObjectExtent, std::allocator<ObjectExtent> >, std::less<object_t>, std::allocator<std::pair<object_t const, std::vector<ObjectExtent, std::allocator<ObjectExtent> > > > >&, unsigned long)+0x1c6) [0x7fd1a0f4f522]
3: (Striper::file_to_extents(CephContext*, char const*, ceph_file_layout const*, unsigned long, unsigned long, unsigned long, std::vector<ObjectExtent, std::allocator<ObjectExtent> >&, unsigned long)+0x69) [0x7fd1a0f4f315]
4: (Striper::file_to_extents(CephContext*, inodeno_t, ceph_file_layout const*, unsigned long, unsigned long, unsigned long, std::vector<ObjectExtent, std::allocator<ObjectExtent> >&)+0x8a) [0x7fd1a0ef9c3c]
5: (ObjectCacher::file_read(ObjectCacher::ObjectSet*, ceph_file_layout*, snapid_t, long, unsigned long, ceph::buffer::list*, int, Context*)+0x7e) [0x7fd1a0efb186]
6: (Client::_read_async(Fh*, unsigned long, unsigned long, ceph::buffer::list*)+0x4ca) [0x7fd1a0ec90d4]
7: (Client::_read(Fh*, long, unsigned long, ceph::buffer::list*)+0x3dc) [0x7fd1a0ec8744]
8: (Client::read(int, char*, long, long)+0x208) [0x7fd1a0ec8100]
9: (ceph_read()+0x5e) [0x7fd1a0e80603]
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-01 00:34:54 +08:00
Josh Durgin
0358840a59
Merge pull request #4461 from ceph/wip-11372
...
librbd: add valgrind memory checks for unit tests
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-04-30 09:21:48 -07:00
Yehuda Sadeh
3842b63a62
Merge pull request #4241 from rzarzynski/wip-11285
...
rgw: rectify broken statistics on Swift account listing.
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-30 08:37:42 -07:00
