Commit Graph

32054 Commits

Author SHA1 Message Date
Sage Weil
2fbd77206c qa/workunits/cephtool/test.sh: fix thrash (more)
If I have to touch this again I will remove it.  Ugh.  This time,

ubuntu@teuthology:/var/lib/teuthworker/archive/teuthology-2014-03-11_02:30:01-rados-firefly-distro-basic-plana/125922

hit NXIO a few lines down because one of the OSDs was still down.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-03-11 17:03:23 -07:00
Sage Weil
a459c4e2ed Merge pull request #1417 from ceph/wip-7663
Wip 7663

Reviewed-by: Sage Weil <sage@inktank.com>
2014-03-11 16:38:28 -07:00
Sage Weil
0b31cf48f2 Merge pull request #1416 from ceph/wip-div
More log handling fixes

Reviewed-by: Sage Weil <sage@inktank.com>
2014-03-11 16:05:12 -07:00
Sage Weil
24774a8165 osd/ReplicatedPG: fix typo
This is the object count, not the dirty object count.  Broken by
00bf3b5674.

Reported-by: Greg Farnum <greg@inktank.com>
Signed-off-by: Sage Weil <sage@inktank.com>
2014-03-11 12:15:38 -07:00
Sage Weil
28a1d77ac0 Merge pull request #1430 from ceph/wip-7674
osd/ReplicatedPG: do not include hit_set objects in full calculation

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-03-11 11:43:35 -07:00
Sage Weil
00bf3b5674 osd/ReplicatedPG: do not include hit_set objects in full calculation
If we have a low target and there are hit_set objects (which cannot be
evicted), we can get stuck in a full state and never get out of it.

Fixes: #7674
Signed-off-by: Sage Weil <sage@inktank.com>
2014-03-11 10:53:39 -07:00
Sage Weil
f57121ac4d Merge pull request #1418 from ceph/wip-7672
PG::choose_acting: filter CRUSH_ITEM_NONE out of have

Reviewed-by: Sage Weil <sage@inktank.com>
2014-03-11 10:23:04 -07:00
Sage Weil
18d80656bb Merge pull request #1429 from ceph/wip-7592-final
Wip 7592 final

Reviewed-by: Sage Weil <sage@inktank.com>
2014-03-11 10:18:59 -07:00
Sage Weil
59834d60c4 Merge pull request #1410 from ceph/wip-flock
mds: fix owner check of file lock

Reviewed-by: Sage Weil <sage@inktank.com>
2014-03-11 10:00:48 -07:00
Sage Weil
0752f284a9 Merge pull request #1385 from ceph/wip-nfs-export
mds: introduce LOOKUPNAME MDS request

Reviewed-by: Sage Weil <sage@inktank.com>
2014-03-11 09:59:33 -07:00
David Zafman
1836b6c7d9 osd: hit_set_persist(): Verify all objects aren't degraded
Fixes: #7592

Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-03-11 09:51:51 -07:00
Warren Usui
1249b0bd76 Use pgrep radosgw to determine if rados gateway is running.
Fixes: 7528
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Signed-off-by: Warren Usui <warren.usui@inktank.com>
(cherry picked from commit 5b88856cd2)
2014-03-10 20:40:52 -07:00
Warren Usui
745f72c5c2 Fixed get_status() to find client.radosgw fields inside of ps output.
Fixes: 7375
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Signed-off-by: Warren Usui <warren.usui@inktank.com>
(cherry picked from commit 8020dcf779)
2014-03-10 20:40:41 -07:00
Warren Usui
880bc3a536 Fix get_status() to find client.rados text inside of ps command results.
Added port (fixed value for right now in teuthology) to hostname.
Fixes: 7374
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Signed-off-by: Warren Usui <warren.usui@inktank.com>
(cherry picked from commit 8200b8a025)
2014-03-10 20:40:07 -07:00
David Zafman
fbd9c15460 osd: Remove unused checkpoint code
Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-03-10 19:53:26 -07:00
Yan, Zheng
d3e3df7ad7 mds: fix owner check of file lock
flock and posix lock do not use process ID as owner identifier.
The process ID of who holds the lock is just for F_GETLK fcntl(2).
For linux kernel, File lock's owner identifier is the file pointer
through which the lock is requested.

The fix is do not take the 'pid_namespace' into consideration when
checking conflict locks. Also rename the 'pid' fields of struct
ceph_mds_request_args and struct ceph_filelock to 'owner', rename
'pid_namespace' fields to 'pid'.

The kclient counterpart of this patch modifies the flock code to
assign the file pointer to the 'owner' field of lock message. It
also set the most significant bit of the 'owner' field. We can use
that bit to distinguish between old and new clients.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-03-11 09:45:43 +08:00
Samuel Just
8a72de3e88 ReplicatedPG: adjust pending_attrs correctly in copy_from
Otherwise, subsequent reads might not get the correct cached attrs.

Fixes: #7663
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-03-10 16:03:37 -07:00
Samuel Just
6669e4d69e ReplicatedPG: _delete_head should adjust pending_attrs
We need the old attr_cache in make_writeable for the clone,
so make the changes to pending_attrs.

Fixes: #7663
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-03-10 16:03:29 -07:00
Samuel Just
60c1b9a578 ReplicatedPG: use pending_attrs in rollback
Otherwise, we won't have the correct attr_cache in
make_writeable for the clone.

Fixes: #7663
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-03-10 16:02:41 -07:00
Samuel Just
8de8819353 PG::choose_acting: filter CRUSH_ITEM_NONE out of have
Fixes: #7672
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-03-10 13:36:39 -07:00
Stephan Renatus
aba5b7cccb rbdmap: bugfix upstart script
It seems like the upstart script is lacking a little behind [the initscript](https://github.com/ceph/ceph/blob/master/src/init-rbdmap#L44-L49); however, this bugfix makes it actually do what it should do.

Before, the bug made the job just ignore all parameters, with the following error in /var/log/upstart/rbdmap.log:

```
rbd map volumes/volume-one
rbd: add failed: (22) Invalid argument
```

Signed-off-by: Stephan Renatus <s.renatus@x-ion.de>
Signed-off-by: Sage Weil <sage@inktank.com>
2014-03-10 08:54:37 -07:00
Samuel Just
83731a75d7 ReplicatedPG::finish_ctx: clear object_info if !obs.exists
Otherwise, we see a different object_info_t depending on whether the
transaction deleting the object clears before another op recreating it appears.
In particular, we use oi.version to set the prior_version on the log entries in
finish_ctx.  If the oi is allowed to stick around the recreation log event will
have a prior version of the deletion event when it should have a prior version
of eversion_t().

Fixes: #7655
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2014-03-09 12:22:12 -07:00
Sage Weil
40dc3f8b2c Merge pull request #1405 from ceph/wip-7575
osd: Add hit_set_flushing to track current flushes and prevent races

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-03-09 12:21:35 -07:00
Danny Al-Gaaf
a7afa1453b config.cc: add debug_ prefix to subsys logging levels
Add debug_ prefix also for 'ceph --admin-daemon *.asok config show'
as already done e.g. by 'ceph-osd --show-config'.

Fixes: #7602

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Reviewed-by: Sage Weil <sage@inktank.com>
2014-03-09 10:32:39 -07:00
Sage Weil
2474e5322d Merge pull request #1408 from ceph/wip-da-fix-doc
Fixes and updates for doc

Reviewed-by: Sage Weil <sage@inktank.com>
2014-03-09 09:56:18 -07:00
Danny Al-Gaaf
54ffdcc45d get-involved.rst: update information
Added #ceph-devel IRC channel, more mailing lists, wiki and planet.ceph.com.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-03-09 02:18:28 +01:00
Danny Al-Gaaf
d1a888e0f2 swift/containerops.rst: fix some typos
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-03-09 01:02:43 +01:00
Danny Al-Gaaf
93b95a2874 radosgw/troubleshooting.rst: s/ceph-osd/OSD/
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-03-09 00:58:57 +01:00
Danny Al-Gaaf
2223a372d6 radosgw/config-ref.rst: fix typo
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-03-09 00:30:49 +01:00
Danny Al-Gaaf
87618d4508 session_authentication.rst: fix some typos
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-03-09 00:19:08 +01:00
Danny Al-Gaaf
682c695898 release-process.rst: fix some typos
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-03-09 00:07:39 +01:00
Danny Al-Gaaf
72ee3389af doc: s/osd/OSD/ if not part of a command
First attempt to unify usage of OSD over rst files.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-03-09 00:01:40 +01:00
Danny Al-Gaaf
e666019434 doc/dev/logs.rst; fix some typos
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-03-08 23:31:11 +01:00
Danny Al-Gaaf
bbd1c4bab5 filestore-filesystem-compat.rst: fix typo
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-03-08 23:25:53 +01:00
Danny Al-Gaaf
ae123a6dd5 corpus.rst: fix typo
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-03-08 23:22:38 +01:00
Danny Al-Gaaf
cf9f017d4e config.rst: fix typo
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-03-08 23:16:24 +01:00
Danny Al-Gaaf
5aaecc7210 cephx_protocol.rst: fix typo
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-03-08 23:11:25 +01:00
Danny Al-Gaaf
2cbb0a402b architecture.rst: fix typos
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-03-08 11:27:15 +01:00
Danny Al-Gaaf
a4cbb192ab rados/operations/control.rst: fix typo
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-03-08 11:13:52 +01:00
Samuel Just
2591668158 PGLog::proc_replica_log: select divergent log entries correctly
Looking for an entry in olog which matches one of ours might add
extra divergent entries.  Instead, do what merge_log does and
walk back through the auth log looking for an entry in olog.

Fixes: 7657
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-03-07 16:53:51 -08:00
Samuel Just
3befb936c2 PGLog::_merge_object_divergent_entries: handle missing.have == prior_version
Fixes: #7658
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-03-07 16:53:51 -08:00
Samuel Just
7c77ff626d TestPGLog: add a test case verifying case where we have the prior_version
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-03-07 16:53:51 -08:00
Samuel Just
e830f9ffc3 TestPGLog: check on last_update in run_test_case
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-03-07 16:53:51 -08:00
Samuel Just
4d6a74d448 TestPGLog::proc_replica_log: call doesn't adjust olog
We don't adjust head with proc_replica_log, don't assert that
it's been adjusted.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-03-07 16:53:51 -08:00
Yan, Zheng
71b4474b70 client: fix Client::getcwd()
An recent commit made MDS not include dentry trace in LOOKUPPARENT
reply. It broke Client::getcwd. The fix is change getcwd() to use
LOOKUPNAME MDS request

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-03-08 07:27:58 +08:00
Sage Weil
db0c37829c Merge remote-tracking branch 'gh/wip-7210' into firefly
Reviewed-by: Sage Weil <sage@inktank.com>
2014-03-07 15:23:31 -08:00
Yan, Zheng
617ce6761e mds: introduce LOOKUPNAME MDS request
The new MDS request is used for connecting a given inode to its
parent inode. It allows client to have efficient implementation of
get_rename() NFS export callback.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-03-08 07:22:06 +08:00
Sage Weil
1c8c61897d qa/workunits/cephtool/test.sh: fix 'osd thrash' test
- fix the wait check for osds to come back up
- make sure they get marked back in, too

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
2014-03-07 15:21:38 -08:00
Sage Weil
20754779ab Merge pull request #1403 from ceph/wip-7642
mon: fix check for primary-affinity feature bit, and fix a race in similar checks

Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
2014-03-07 15:05:30 -08:00
Sage Weil
b62f9f076a mon/OSDMonitor: feature feature check bit arithmetic
Make sure all features are present (instead of just any of them).

Signed-off-by: Sage Weil <sage@inktank.com>
2014-03-07 14:44:42 -08:00