Commit Graph

56853 Commits

Author SHA1 Message Date
Casey Bodley
9852b0c502 Merge pull request #10475 from yonghengdexin735/wip-zzz-rgw
rgw/rgw_main: fix unnecessary variables defined

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-08-08 14:14:35 -04:00
Casey Bodley
d565e8904e Merge pull request #10589 from Yan-waller/yj-wip-rgwcls-0805
rgw: remove unused variables

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-08-08 14:08:37 -04:00
Casey Bodley
491d0ce5a2 Merge pull request #10611 from linuxbox2/rgw-nfs-28
Rgw nfs 28

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-08-08 13:56:27 -04:00
Kefu Chai
a9a89e59bc test/ceph_test_msgr: better looking log
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-08-09 00:12:11 +08:00
Kefu Chai
7d7f9b300b test/ceph_test_msgr: fix a mem leak
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-08-09 00:12:11 +08:00
Kefu Chai
cf1801c260 test/ceph_test_msgr: fix circular locking dependency
* do not acquire lock when sending message
* remove lock in session
* reduce the scope guarded by locks for better performance.

Fixes: http://tracker.ceph.com/issues/16955
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-08-09 00:12:11 +08:00
Matt Benjamin
b4d079f2b5 rgw nfs: fix write continuations
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-08-08 11:11:51 -04:00
Matt Benjamin
d74d46170d rgw nfs: don't leak fh->mtx in lookup_handle()
This change fixes a serious latent locking problem, noticed after
updating the ganesha/rgw driver invalidation after renames.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-08-08 11:11:35 -04:00
Matt Benjamin
297220fd2a rgw file: refuse to rename directories
The representation of paths as an aggregate involving any
number of objects argues against ever permitting such
operations.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-08-08 10:18:35 -04:00
Matt Benjamin
34224ecd83 rgw_file: refuse ops on deleted targets
Detect these illegal cases, as they are indicate various incorrect
behaviors/bugs.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-08-08 10:17:13 -04:00
Kefu Chai
3d00b3558c Merge pull request #10598 from dillaman/wip-16882
cmake: correct ceph_test_librbd/ceph_test_rbd_mirror linkage

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-08 12:01:49 +08:00
John Spray
df32a8b4a9 Merge pull request #9566 from ffilz/master
Add ceph_ll_setlk and ceph_ll_getlk

Reviewed-by: John Spray <john.spray@redhat.com>
2016-08-07 15:49:20 +01:00
John Spray
d9948bbdb7 Merge pull request #10452 from jcsp/wip-16556
test: break out librados-using cephfs test
2016-08-07 15:48:49 +01:00
Venky Shankar
3492153d36 journaler: remove ununsed synchronous API routines
Synchronous callers now call the asynchronous version wrapped
around C_SaferCond. Also take care of mocked methods.

Fixes: http://tracker.ceph.com/issues/15321
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 18:54:00 +05:30
Venky Shankar
171314869d test: fix CreateImageRequest unit test case
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 18:53:59 +05:30
Venky Shankar
76e2d867ef rbd-mirror: asynchronously create mirror images
Use the newly instroduced asynchronous image creation state
machine (CreateRequest) to create mirrored images.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 18:53:59 +05:30
Venky Shankar
830e0f1f4a librbd: minor refactor in create_v1()
create_v2() uses util::generate_image_id() therefore not
requiring 'bid' to be passed in as parameter. This makes
bid generation in create() unnecessary -- hence move this
call to create_v1().

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 18:53:59 +05:30
Venky Shankar
d2baf76d67 cls / librbd: use asynchronous image creation state machine
... plus changes in rbd class library to use helpers methods.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 18:53:59 +05:30
Venky Shankar
1c82132321 librbd: helper to generate unique image id
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 18:53:59 +05:30
Venky Shankar
65d44d57dd librbd: asynchronous image creation state machine
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 16:31:37 +05:30
Venky Shankar
d5fa466d0a librbd / journal: async journal creation state machine
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 16:31:37 +05:30
Venky Shankar
c4129418f8 journaler: async journal object creation
Introduce asynchronous journal object creation. This is
a prerequisite for asynchronous creation of rbd image
journals.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 16:31:37 +05:30
Venky Shankar
c4e439dcdd librbd / journal: async journal removal state machine
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 16:31:37 +05:30
Venky Shankar
226a5d2070 journaler: implement asynchronous remove()
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 16:31:37 +05:30
Venky Shankar
0dfbadda45 journaler: implement asynchronous exists()
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 16:31:36 +05:30
Venky Shankar
c0848e262d journaler: asynchronous JournalTrimmer::remove_objects()
Asynchronous removal of journal objects for a given rbd image.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 16:31:36 +05:30
Venky Shankar
1416f1c3bc librbd / ImageCtx: singleton safetimer instance helper
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 16:31:36 +05:30
Venky Shankar
21e6573d49 librbd / ImageCtx: singleton thread pool instance helper
Introduce static member function in ImageCtx to fetch (and
initialize) singleton thread pool.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 16:31:36 +05:30
Mykola Golub
89a37496e7 Merge pull request #10574 from dillaman/wip-16923
librbd: delay acquiring lock if image watch has failed

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-08-07 13:33:45 +03:00
Mykola Golub
8f8b92f3a1 Merge pull request #10581 from dillaman/wip-16887
librbd: prevent creation of v2 image ids that are too large

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-08-07 13:33:01 +03:00
Willem Jan Withagen
80398f043f src/CMakeLists.txt: remove unneeded libraries from ceph-dencoder target
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2016-08-06 23:07:13 +02:00
Victor Denisov
3c70a7611e rbd: Add images to consistency groups cli
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2016-08-05 19:09:28 -07:00
Victor Denisov
1b826e132c librbd: Implement consistency group images operations
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2016-08-05 19:09:28 -07:00
Victor Denisov
8bfd9f0549 cls_rbd: Implement images in consistency groups
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2016-08-05 19:09:28 -07:00
Jason Dillaman
aa679df487 cmake: correct ceph_test_librbd/ceph_test_rbd_mirror linkage
This now matches the autotools configuration and fixes the failed
assertion during test execution.

Fixes: http://tracker.ceph.com/issues/16882
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-05 15:34:00 -04:00
Matt Benjamin
41af3bb45e Merge pull request #10579 from dreamhost/wip-16928
rgw: Fix civetweb IPv6

verified:  autobuild
2016-08-05 15:26:57 -04:00
Matt Benjamin
b84046b936 Merge pull request #10597 from pritha-srivastava/wip_ldap_fix
rgw: Fix for incorrect access key id in reworked ldap auth code.

verified non-regression (MS AD)
2016-08-05 15:02:55 -04:00
Pritha Srivastava
c7dae89016 rgw: Fix for incorrect access key id reworked ldap auth code.
The reworked ldap code does not use the correct access key id in get_policy.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
2016-08-05 22:47:07 +05:30
Jason Dillaman
b0b1a8b438 Merge pull request #10595 from tchaikov/wip-rocksdb
rocksdb: revert the change introduced by dc41731

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-08-05 11:41:00 -04:00
Casey Bodley
06c384f1c5 rgw: fixes for period puller
* reset epoch=0 before RGWPeriod::init() so we get the latest_epoch
* if we're the metadata master, don't try to pull periods from ourself

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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-08-05 11:40:40 -04:00
Kefu Chai
1e1f65e032 rocksdb: revert the change introduced by dc41731
dc41731 reverts the submodule reference of rocksdb, and point it to an
older version which fails to support ppc64le and AArch64.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-08-05 23:33:58 +08:00
Yuri Weinstein
8175ce07b8 Merge pull request #10262 from dachary/wip-16580-ceph-disk-timeout
ceph-disk: timeout ceph-disk to avoid blocking forever

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Ken Dreyer (Red Hat) <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
2016-08-05 08:22:39 -07:00
Yuri Weinstein
bb7424e860 Merge pull request #10491 from xiexingguo/xxg-wip-osdmon-2016-07-28
osd/OSDMonitor: misc. fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-05 08:14:02 -07:00
Yuri Weinstein
23e731807c Merge pull request #9259 from xiexingguo/xxg-wip-fix-monclientpinger
mon: MonClient may hang on pinging an unresponsive monitor

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-05 08:12:29 -07:00
Casey Bodley
e0e25dd99d Merge pull request #10593 from linuxbox2/ldap-bindv3-again
rgw ldap: enforce simple_bind w/LDAPv3

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-08-05 11:11:36 -04:00
Yuri Weinstein
4075f98da1 Merge pull request #9718 from songbaisen/a8
mon: clear list in better way

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-05 08:09:58 -07:00
Yuri Weinstein
6a1f5a294a Merge pull request #10392 from stiopaa1/mon_monclient_moveCCancelMonCommand
mon/MonClient: move C_CancelMonCommand to cc file

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-05 08:09:07 -07:00
Yuri Weinstein
8fd699c5c5 Merge pull request #10470 from xiexingguo/xxg-wip-osd-2016-07-28
osd: minor performance improvements

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-08-05 08:08:19 -07:00
John Spray
e688f5f80e Merge pull request #10539 from jcsp/wip-mds-counters
mds: add perf counters for MDLog replay and SessionMap

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-08-05 15:55:56 +01:00
Matt Benjamin
08d5429143 rgw ldap: enforce simple_bind w/LDAPv3
Found by Harald Klein <hklein@redhat.com>.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-08-05 10:38:39 -04:00