Commit Graph

52115 Commits

Author SHA1 Message Date
Sage Weil
4d36da6dcd Merge pull request #8456 from dreamhost/wip-authtool-help
authtool: update --help and manpage to match code.

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-07 11:44:30 -04:00
Sage Weil
66b7ae6610 Merge pull request #8446 from liewegas/wip-15366
osd: fix/clean up full map request handling

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-04-07 11:36:34 -04:00
Sage Weil
134416a021 Revert "rados: Add new field flags for ceph_osd_op.copy_get."
This reverts commit 2b4acfb1b8.

We fixed this on the receiving end in
fc51ce2a83 a few weeks after this commit
was added.  It's ugly and no longer needed.

This *does* mean that we'll start to copy some data and then abort
partway through, but that's better than an kludgey protocol/interface.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-07 11:13:03 -04:00
Orit Wasserman
999e917e5e Merge pull request #8472 from jmunhoz/fix-aws4-subdomain-calling
rgw: aws4 subdomain calling bugfix
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-04-07 16:59:09 +02:00
Jason Dillaman
017d830848 rbd-mirror: workaround for intermingled lockdep singletons
If librados constructs the CephContext, lockdep will be initialized
in both the librados shared address space and also within the app
address space.  This breaks lockdep's functionality and results in
a crash upon shutdown.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-07 10:36:30 -04:00
Sage Weil
98744fdf9b logrotate.conf: poke ceph-fuse after log rotation
This still leaves other loggers with un-reopened log files,
unfortunately.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-07 10:27:17 -04:00
Sage Weil
91e0be047c ceph-fuse: reopen log file on SIGHUP
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-07 10:26:43 -04:00
Matt Benjamin
340fe95b56 Merge pull request #8460 from linuxbox2/jewel-nfs-fixes-3
Jewel nfs fixes 3
2016-04-07 10:26:11 -04:00
Jason Dillaman
60679fc53a librbd: restore out-of-band future callbacks to avoid lock cycles
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-07 10:25:24 -04:00
renhwztetecs
e98d046a65 MDS: unregister command add in clean_up_admin_socket
unregister command add in MDSDaemon::clean_up_admin_socket

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-04-07 18:46:28 +08:00
Javier M. Mellid
2f4bc8401d rgw: aws4 subdomain calling bugfix
Fixes: http://tracker.ceph.com/issues/15369

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
2016-04-07 12:39:34 +02:00
weiqiaomiao
dab0b55987 rgw: the map 'headers' is assigned a wrong value
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
2016-04-07 14:12:51 +08:00
Loic Dachary
c2fd18c00d Merge pull request #8457 from dreamhost/wip-virtualenv-tmpdir
build: Respect TMPDIR for virtualenv.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-04-07 07:24:45 +02:00
Robin H. Johnson
f01261f371 authtool: fix test output validation & minor whitespace.
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-04-06 21:31:44 +00:00
Jason Dillaman
408964eb09 journal: fix context memory leak when shutting down live replay
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-06 17:20:30 -04:00
Jason Dillaman
f931066cf5 journal: Future does not require metadata shared pointer
Avoid keeping the metadata object alive through the lifespan of the
future.  Callers can expect to receive a re-entrant callback if the
future is already safe and flush/wait is invoked.

Fixes: http://tracker.ceph.com/issues/15364
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-06 17:18:33 -04:00
Sage Weil
d3dbd8581b mon: warn if 'sortbitwise' flag is not set and no legacy OSDs are present
If the user has upgraded, they should set sortbitwise.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-06 17:03:53 -04:00
Sage Weil
297f5f2ce7 Merge pull request #8418 from liewegas/wip-blk-probe
os/ObjectStore: make device uuid probe output something friendly
2016-04-06 16:57:11 -04:00
Sage Weil
82e9f94523 Merge pull request #8428 from liewegas/wip-rest-mds
ceph-rest-api: fix fs/flag/set
2016-04-06 16:10:53 -04:00
Sage Weil
ed31ad64a4 Merge pull request #7981 from liewegas/wip-14364
osdc/Objecter: fix narrow race with tid assignment

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-04-06 15:52:10 -04:00
Sage Weil
b3d27f8ca7 Merge pull request #8403 from dx9/wip-ceph-dencoder-esessions-fix
mds: Add cmapv to ESessions default constructor initializer list

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-06 15:51:40 -04:00
Sage Weil
683a46cd5a Merge pull request #8419 from adamemerson/wip-32bit-time
common: fix time_t cast in decode

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-06 15:49:22 -04:00
Sage Weil
78d4fada4b Merge pull request #8431 from liewegas/wip-bluestore
os/bluestore: revamp BlueFS bdev management and add perfcounters
2016-04-06 15:48:45 -04:00
Orit Wasserman
f64a9e3b42 Merge pull request #8445 from jmunhoz/fix-aws4-uri-encoding
rgw: aws4 uri encoding bugfix
Review-by: Orit Wasserman <owasserm@redhat.com>
2016-04-06 20:37:58 +02:00
John Spray
d544e447df mds: validate file layouts during replay
Instead of letting potentially bogus stuff into
the cache, go damaged().

Signed-off-by: John Spray <john.spray@redhat.com>
2016-04-06 16:23:16 +01:00
Sage Weil
7b1ed5dd14 Merge pull request #8450 from javacruft/tasksmax-infinity
systemd: drop any systemd imposed process/thread limits

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-06 09:36:15 -04:00
Sage Weil
9414befb89 debian/rules: include ceph-mds-*.conf upstart files in ceph-mds
These were lost by a typo in 0cbe3dea69

Fixes: http://tracker.ceph.com/issues/15395
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-06 08:55:49 -04:00
John Spray
45a0bc103c mds: add operator<< for file_layout_t
Signed-off-by: John Spray <john.spray@redhat.com>
2016-04-06 13:05:17 +01:00
John Spray
693f46a75a mds: skip size recovery on non-file inodes
Previously even directories were getting added to the
list of inodes to check in rejoin.  This was a (small)
waste of time, with these dir inodes getting passed
all the way down into check_inode_max_size for no purpose.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-04-06 13:05:17 +01:00
John Spray
0f0964263c mds: tidy up backtrace pool handling
Include the pool ID in the log message when
we get a write error (and don't say "dir ino"
because this is also the path for files)

Move the duplicated logic for picking the pool out
into get_backtrace_pool()

In get_backtrace_pool(), assert that files do indeed
have a pool set.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-04-06 13:05:17 +01:00
John Spray
4ddcf415ef mds: health metric for being read only
This is the state we get after an OSD write
error, so it's definitely something we want
to tell the user about in ceph status.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-04-06 13:05:16 +01:00
Jason Dillaman
7c70281e00 Merge pull request #8459 from jdurgin/wip-rbd-op-threads
librbd: disallow unsafe rbd_op_threads values

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-06 07:46:53 -04:00
John Spray
1238bd8a27 Merge pull request #8455 from liewegas/wip-legacy-layout-zero
mds: fix file_layout_t legacy encoding snafu

Reviewed-by: John Spray <john.spray@redhat.com>
2016-04-06 11:41:24 +01:00
xie xingguo
79b19a6ca5 osd: cancel scrub if noscrub is set for pool or all
The sched_scrub() method can be called by various code path, such as
OSD::tick() or triggered by a scrub_reserve_reply message.

The sched_scrub() will check whether or not the noscrub is globally set or
set for a specified pool before really starting to schedule a scrub job.
However, if we set noscrub flag for a specified pool, there are other pools
for which scrub are still legal and thus shall be granted.

The problem here is that we may stopping a pg's scrub in an intermidate stage
due to setting of the corresponding pool's noscrub flag whithout releasing
the reservation. Which as a result shall prevent other pgs of a different
pool from going scrubbing because we have already hit the reservation limit.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-06 13:36:58 +08:00
xie xingguo
4d3aef75ec osd: reset tp handle when search for boundary of chunky-scrub
One of our tests in our local testbed shows that if the number of snapshots
become extremely huge, the process of chunky-scrub() may encouter
heart-beat failure. This is because it takes a real long time for the
procedure to traverse and determine the boundary for a single run of
chunk scrub under this case.

This pr tries to solve the above the problem by resetting the tp handle
passed in once in a while(after a certain number of loops, 64 by default)
since the search can become very time-consumptive. Furthermore, the
BUILD_MAP stage later on shall encouter the same problem but has already
got fixed in the same way. Therefore, although the test case is rare,
but this change is defensive and make our code strong and thus shall be
considered as worthwhile.

Fixes: tracker.ceph.com/issues/12892
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-06 11:07:38 +08:00
Sage Weil
25d80078e2 os/bluestore: use short, relative paths with bluefs
If we're using bluefs, only pass in the short relative
path (db, db.wal, db.slow).  The leading components
are ignored and only lead to errors if the configuration
provides relative paths that do not match (e.g., if one
if using ceph-objectstore-tool).

Fixes: http://tracker.ceph.com/issues/15376
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-05 21:26:06 -04:00
Jenkins Build Slave User
ce50389b77 10.1.1 2016-04-06 00:45:19 +00:00
Josh Durgin
6c0ab75bce librbd: disallow unsafe rbd_op_threads values
Don't use this config option in librbd until
http://tracker.ceph.com/issues/15034 is avoided.

The option itself is still useful for mirroring threads, where
ordering is unimportant.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2016-04-05 15:32:42 -07:00
Matt Benjamin
bb4c2cacb2 librgw/rgw_file: correctly handle object permissions
Implement the full object permission model for librgw (aka, NFS
and similar) operations.

Fixes DIRS1 unit tests.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-04-05 18:30:32 -04:00
Matt Benjamin
6851822afe rgw_file: print DIRS1 read parameters at verbose
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-04-05 18:30:26 -04:00
Matt Benjamin
d84f55f3fe rgw_file: fix attributes for "special" test cases
If a caller does an atomic create using rgw_lookup() and
RGW_LOOKUP_FLAG_CREATE, it needs to fix up the attributes using
create_stat().

For use outside of test cases, it probably needs an interlock also,
but for now, do just enough to satisfy existing attribute checks.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-04-05 18:30:20 -04:00
Matt Benjamin
1bd1ffda8d rgw_file unit tests: validate Unix owners in DIRS1
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-04-05 18:30:14 -04:00
Robin H. Johnson
8e2c804a3a authtool: update --help and manpage to match code.
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-04-05 22:10:13 +00:00
Robin H. Johnson
dffd867285 build: Respect TMPDIR for virtualenv.
Gentoo's normal build process uses a sandbox to catch writes outside the
build environment; this includes providing a value other than /tmp for
TMPDIR. Use TMPDIR by default for CEPH_BUILD_VIRTUALENV.

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-04-05 21:28:41 +00:00
Sage Weil
048251b66c common/fs_types: dump pool_id signed
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-05 16:37:27 -04:00
Sage Weil
cd41ca2968 mds: fix legacy layout decode with pool 0
If you data pool was pool 0, this was transforming
that to -1 unconditionally, which broke upgrades.  We
only want do that for a fully zeroed ceph_file_layout,
so that it still maps to a file_layout_t.  If any fields
are set, though, we trust the fl_pgpool to be a valid
pool.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-05 16:37:25 -04:00
Orit Wasserman
0b09e477a5 Merge pull request #8447 from cbodley/wip-cmake-mrun
mrun: update path to cmake binaries
2016-04-05 21:42:48 +02:00
Casey Bodley
b8e045844f rgw: retry read_log_info() while master is down
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-04-05 14:07:22 -04:00
Kefu Chai
03bf796075 Merge pull request #8430 from wjin/fix
crush: fix error log

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-04-06 00:37:41 +08:00
James Page
05cafcf19f Drop any systemd imposed process/thread limits
If systemd has task accounting enabled, a default of 512 tasks
will be applied to all systemd units.

For ceph, this is way to low even for a modest cluster, so stop
this restriction being applied and allow administrators to apply
limits using sysctl.

Signed-off-by: James Page <james.page@ubuntu.com>
2016-04-05 17:33:57 +01:00