runsisi
09b53567b8
cls_journal: fix -EEXIST checking
...
Signed-off-by: runsisi <runsisi@zte.com.cn>
2016-04-01 20:56:26 +08:00
Jason Dillaman
550761b5f6
Merge pull request #8371 from runsisi/wip-fix-eexist
...
cls_rbd: fix -EEXIST checking in cls::rbd::image_set
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-31 13:34:26 -05:00
Sage Weil
e925c67cc3
Merge pull request #8400 from qhjindev/fix_mon
...
mon: remove unnecessary comment for update_from_paxos
2016-03-31 11:21:50 -04:00
Casey Bodley
1302143813
Merge pull request #8399 from oritwas/wip-cmake-mirrorwatcher
...
cmake: add missing librbd/MirrorWatcher.cc and librd/ObjectWatcher.cc
2016-03-31 11:05:14 -04:00
Qinghua Jin
639f158db2
mon: remove unnecessary comment for update_from_paxos
...
The return value comment for update_from_paxos is unnecessary.
Signed-off-by: Qinghua Jin <qhjin_dev@163.com>
2016-03-31 22:37:12 +08:00
Orit Wasserman
f5ef4d44e0
cmake: add missing librbd/MirrorWatcher.cc and librd/ObjectWatcher.cc
...
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-03-31 16:00:06 +02:00
Orit Wasserman
825a5ddcd4
Merge pull request #8394 from xiexingguo/xxg-wip-compile
...
rgw: fix compiling error
2016-03-31 15:57:55 +02:00
Loic Dachary
aab32bddb3
Merge pull request #8358 from dachary/wip-releases
...
releases: what is merged where and when ?
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-31 15:16:29 +02:00
Loic Dachary
919ff4ff29
releases: what is merged where and when ?
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-31 15:10:40 +02:00
Loic Dachary
9f60e07267
releases: update understanding the release cycle
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-31 15:01:09 +02:00
Loic Dachary
c1c71ecf23
release-notes: v10.0.5 release notes
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-31 15:01:09 +02:00
Orit Wasserman
7df7c2a07d
Merge pull request #7875 from badone/wip-coverity-rgw_file-unused
...
[rgw] Check return code in RGWFileHandle::write
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-03-31 14:52:02 +02:00
xie xingguo
535eb0e608
rgw: fix compiling error
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-31 19:48:38 +08:00
Orit Wasserman
938c45e3fa
Merge pull request #8200 from H3C/wip-rgw-bugfixb
...
rgw/rgw_admin:fix bug about list and stats command
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-03-31 13:43:49 +02:00
Loic Dachary
e5505523a1
Merge pull request #8373 from wjwithagen/patch-4
...
ceph-detect-init/run-tox.sh: FreeBSD: No init detect
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-03-31 12:21:56 +02:00
Orit Wasserman
b9321d01b5
Merge pull request #8387 from dreamhost/wip-mp-listpartresult-etag
...
rgw: Multipart ListPartsResult ETag quotes
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-03-31 11:55:13 +02:00
Robin H. Johnson
a58b774e72
rgw: Multipart ListPartsResult ETag quotes
...
ListPartsResult output has always missed quotes on the ETag since it was
first committed.
Fixes : #15334
Backports: hammer, infernalis
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-03-31 06:25:58 +00:00
Sage Weil
d6569bfe58
Merge pull request #8372 from jcsp/wip-15309
...
qa: update rest test cephfs calls
2016-03-31 01:15:38 -04:00
Sage Weil
b5f8cac89d
Merge pull request #8258 from asheplyakov/bug-12065
...
monclient: avoid key renew storm on clock skew
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-31 01:14:22 -04:00
Sage Weil
9f3e9efdde
Merge pull request #8348 from xiexingguo/xxg-wip-failurepending
...
osd: fix failure report handling during ms_handle_connect()
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-31 01:13:58 -04:00
Sage Weil
6736341fcd
Merge pull request #8369 from xiexingguo/xxg-wip-tick
...
osd: fix tick relevant issues
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-31 01:08:01 -04:00
Sage Weil
0c1f041bec
Merge pull request #8354 from tchaikov/wip-missing-cls
...
osd/ClassHandler: only dlclose() the classes not missing
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-31 01:07:17 -04:00
Josh Durgin
4030ee6e75
Merge pull request #8355 from dillaman/wip-15029
...
librbd: send notifications for mirroring status updates
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-30 18:46:11 -07:00
runsisi
1f8f43daed
cls_rbd: fix -EEXIST checking in cls::rbd::image_set
...
Signed-off-by: runsisi <runsisi@hust.edu.cn>
2016-03-31 09:24:41 +08:00
Sage Weil
d994c111a1
Merge pull request #8382 from athanatos/wip-15241
...
osd: fix epoch check in handle_pg_create
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-30 18:36:42 -04:00
Samuel Just
7e58045f0e
OSD::handle_pg_create: check same_primary_since
...
Rather than add a flag to handle_pg_peering_evt, check
same_primary_since here and pass the create event to
handle_pg_peering_evt as if it originated at the current epoch (the
project_pg_history checks in handle_pg_peering_evt will be noops).
Fixes: tracker.ceph.com/issues/15241
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-30 15:34:31 -07:00
Samuel Just
6b82bc5b65
Merge pull request #8147 from xiaoxichen/fix-get-map
...
osd/OSD.cc: finish full_map_request every MOSDMap message.
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-30 15:25:36 -07:00
Jason Dillaman
57db6176ac
librbd: integrate listener for new mirroring notification payloads
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-30 17:02:02 -04:00
Jason Dillaman
e95a3836b3
librbd: send notifications on mirroring updates
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-30 17:02:02 -04:00
Casey Bodley
e95eb53363
Merge pull request #8084 from sunfch/wip-rgw-init-max-response
...
rgw: accept data only at the first time in response to a request
2016-03-30 17:01:31 -04:00
Jason Dillaman
3748b8874e
librbd: helper methods for mirroring notifications
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-30 17:00:31 -04:00
Jason Dillaman
934ce8647c
librbd: mirroring object notification types
...
Initial payloads for updated mirror pool mode and image state.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-30 17:00:31 -04:00
Jason Dillaman
3145109fd5
librbd: generic object watcher and mirroring watcher
...
The ObjectWatcher can handle generic watch and recovery of
RADOS objects. The MirroringWatcher will handle updates
to the RBD mirroring object.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-30 17:00:31 -04:00
Jason Dillaman
6f8596fc01
Merge pull request #8375 from rjfd/wip-15265
...
librbd: disable image mirroring when image is removed
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-30 12:58:18 -04:00
Josh Durgin
823683c2f7
Merge pull request #8331 from sileht/sileht/rados-cython
...
pybind/rados: python3 fix
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-30 09:20:19 -07:00
Ricardo Dias
bb07a1b23e
rbd: rbd-mirroring: Automatically disable image mirroring when image is removed
...
Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes : #15265
2016-03-30 17:11:10 +01:00
Willem Jan Withagen
8dc2c21006
ceph-detect-init/run-tox.sh: FreeBSD: No init detect
...
- Freebsd has /etc/rc.d with scripts to start daemons at boottime.
Test for that are currently not integrated with Ceph tests
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2016-03-30 17:15:09 +02:00
Jason Dillaman
f05237b93a
Merge pull request #8368 from tchaikov/wip-cmake-fix-rbd
...
cmake: add StandardPolicy.cc to librbd
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-30 10:49:46 -04:00
Sage Weil
d0c5490cdd
Merge pull request #8337 from jmunhoz/fix-15292
...
mon: remove unused variable
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2016-03-30 09:56:37 -04:00
Jason Dillaman
d53f9415ee
Merge pull request #8352 from runsisi/wip-fix-missing-iter
...
rbd-mirror: fix missing increment for iterators
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-30 08:49:55 -04:00
Jason Dillaman
fadb4cd52b
Merge pull request #8374 from trociny/fix-cls-rbd-read_peers
...
cls_rbd: read_peers: update last_read on next cls_cxx_map_get_vals
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-30 08:27:22 -04:00
Sage Weil
052fa90eb7
Merge pull request #7062 from wonzhq/scrub-prio-pool
...
osd: add the support of per pool scrub priority
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-30 08:24:43 -04:00
Sage Weil
325520824e
Merge pull request #8210 from liewegas/wip-12814
...
osd: add 'proxy' cache mode
Reviewed-by: Samuel Just <sjust@redhat.com>
2016-03-30 08:23:05 -04:00
Sage Weil
f75e4d7c10
Merge pull request #8315 from mslovy/wip-clean-pg
...
osd: duplicated clear for peer_missing
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-30 08:22:46 -04:00
Sage Weil
723b46c801
Merge pull request #8330 from xiexingguo/xxg-wip-race
...
common: fix race during optracker switches between enabled/disabled mode
Reviewed-by: David Zafman <dzafman@redhat.com>
2016-03-30 08:22:30 -04:00
Sage Weil
9025d9f114
Merge pull request #8335 from liewegas/wip-13992
...
mon/MonClient: fix shutdown race
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-30 08:21:47 -04:00
Mykola Golub
3995cafae4
cls::rbd: read_peers: update last_read on next cls_cxx_map_get_vals
...
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-30 15:01:05 +03:00
John Spray
557955a233
qa: update rest test cephfs calls
...
Since the ceph task was already creating filesystems
during setup, I presume that these calls only ever
worked when they were using the same names as
the existing filesystem.
Fixes: http://tracker.ceph.com/issues/15309
Signed-off-by: John Spray <john.spray@redhat.com>
2016-03-30 11:43:22 +01:00
xie xingguo
c29895949e
osd: skip heartbeat_check for osd which we haven't sent ping to
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-30 18:01:38 +08:00
xie xingguo
5c5c8dfefe
osd: initialize last_pg_stats_ack correctly on first pg_stats message sending
...
So we don't potentially make an incorrect judgement in the tick_without_osd_lock()
procedure if OSD's first pg_stats message was sent, which as a result shall cause
an unnecessary hunting of new monitor.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-30 18:01:38 +08:00