Greg Farnum
83e58257a9
osdmon: Adjust failure reporting.
...
MOSDFailure can now be a failure or a not-failure report. If it is a
failure, OSDMon will add it to a map of failure reports until a given OSD
exceeds the minimum reports/reporters to qualify as failed, then marks it
down.
Also, only propose new actually marking an osd failed
OSD behavior is not changed, and currently the min reports/reporters are
set to 1 so external OSDMon behavior will also stay the same.
2010-08-05 11:08:50 -07:00
Greg Farnum
5b5c0066f1
osdmap: only decode internal addresses if map is new enough version
2010-08-04 11:40:44 -07:00
Sage Weil
8c4d268907
Merge branch 'testing' into unstable
2010-08-04 10:37:09 -07:00
Sage Weil
6f7523a0a4
rados: -i and -o are still there for other commands
...
Signed-off-by: Sage Weil <sage@newdream.net>
2010-08-04 10:01:23 -07:00
Sage Weil
a7038da72d
ceph.spec.in: fix docdir paths
...
_docdir is /usr/share/doc, not /usr/share/doc/ceph (as it is with debian).
2010-08-04 09:56:05 -07:00
Sage Weil
1cf45017df
ceph.spec.in: fix sample.ceph.conf chown
...
Reported-by: Xiaoguang Liu <syslxg@gmail.com>
2010-08-04 09:51:31 -07:00
Takuya ASADA
1ecda511a1
rados: fix usage
2010-08-04 09:51:31 -07:00
Sage Weil
ef711e2eea
osd: fix heartbeat to/from map updates
...
- always make _inst match _to and _from (don't adjust in note_down_osd)
- only mark down old hb connection in update_heartbeat_peers
- if old peer isn't down, send them a map
- don't print dup new/old messages
Signed-off-by: Sage Weil <sage@newdream.net>
2010-08-04 09:51:24 -07:00
Greg Farnum
fa27b31e68
osd: cover map_in_progress by osd_lock instead of an individual lock.
...
The separate lock is no longer needed and removing it reduces lock contention
and makes it easier to avoid races elsewhere.
2010-08-03 16:13:03 -07:00
Greg Farnum
207a1bdca7
osd: Unlock osd_lock in _dispatch before locking handle_map_lock
2010-08-03 15:21:42 -07:00
Greg Farnum
2fbf1e9f5b
osd: switching dispatch_running to be a counter
...
Now it works with multiple messengers dispatching.
2010-08-03 14:56:02 -07:00
Greg Farnum
c7d2352971
osd: guard _dispatch to prevent execution of new messages while the map is updating
2010-08-03 14:56:02 -07:00
Greg Farnum
dfb85d23e3
osd: adjust map_in_progress guarding
2010-08-03 14:56:02 -07:00
Gregory Farnum
c26cb7276f
cosd: adjust client/cluster messenger setup to be more consistent
...
and poison better
2010-08-03 14:56:02 -07:00
Greg Farnum
b588a56ed5
config: Error out when you can't parse an addr from the config file.
...
Also, fix up a few other addr parsing cases to break properly!
2010-08-03 14:56:02 -07:00
Greg Farnum
d7d615bc15
osd: use the client_messenger for the logclient.
2010-08-03 14:56:02 -07:00
Greg Farnum
42c00850d9
osdmap: remove unused versions of get_[cluster_]inst
2010-08-03 14:56:02 -07:00
Greg Farnum
24989febc2
OSD: use get_cluster_inst instead of get_inst when checking other OSD instances
2010-08-03 14:56:02 -07:00
Greg Farnum
595543f8a5
osd: when checking OSD identities via require_same_or_newer_map, use cluster_addr
2010-08-03 14:56:02 -07:00
Greg Farnum
cec513ff47
osd: add Mutex and flag to cover execution of handle_map_lock.
...
Fixes a crash when the cluster and client messenger both dispatch an
OSDMap and their handling gets intertwined.
2010-08-03 14:56:01 -07:00
Greg Farnum
28b54973b2
osd: be more careful with cluster/client messenger use.
2010-08-03 14:56:01 -07:00
Greg Farnum
582f92855b
osd: register the OSD on cluster_messenger if needed
2010-08-03 14:56:01 -07:00
Greg Farnum
d6c8f8c801
config: correctly notify when OPT_ADDR config options are found.
2010-08-03 14:56:01 -07:00
Greg Farnum
d0f7412e5f
config: add OPT_ADDR type, move "public_addr"/"cluster_addr" processing there
...
Necessary side effect: move public_addr/cluster_addr into g_conf.
2010-08-03 14:56:01 -07:00
Greg Farnum
382290ef2e
messages: add cluster_addr to MOSDBoot, use it in OSD and OSDMonitor
2010-08-03 14:56:01 -07:00
Greg Farnum
d290a046a5
cosd: move messenger existence checks to where they're useful
2010-08-03 14:56:01 -07:00
Greg Farnum
7eeca9b8a9
cosd: create separate cluster/client messengers if separate addresses are provided.
2010-08-03 14:56:01 -07:00
Greg Farnum
eb708208d1
msgr: set up bind and Accepter::bind to take in addresses and bind to them
2010-08-03 14:56:01 -07:00
Greg Farnum
6abf48dad3
config: rename g_my_addr to g_public_addr, add g_cluster_addr
2010-08-03 14:56:01 -07:00
Greg Farnum
26ff6cb5f2
osdmap: move osd_cluster_addr decoding, and make sure that size matches osd_addr
2010-08-03 14:56:01 -07:00
Greg Farnum
ed28d5e668
osdmap: Make sure osd_cluster_addr matches osd_addr size on decode
2010-08-03 14:56:01 -07:00
Greg Farnum
ef9a4eeb2b
osd: remove messenger pointer, fix calls to it in PG and ReplicatedPG
2010-08-03 14:56:01 -07:00
Greg Farnum
abff099060
osd: use cluster/client_messenger as appropriate.
...
Modify send_incremental_map to choose based on the type of the entity.
2010-08-03 14:56:01 -07:00
Greg Farnum
7f70112052
osdmap: add osd_cluster_addr to full map
...
Include it in lookups and add get_cluster_inst et al to match get_inst et al
2010-08-03 14:56:01 -07:00
Greg Farnum
ded7b8e2c1
osd: make new cluster_messenger, client_messenger pointers.
...
Don't remove old messenger, just alias it to client_messenger.
2010-08-03 14:56:01 -07:00
Greg Farnum
bc9cb9311f
osdmap: make room in incremental for separate cluster/client OSD addrs.
2010-08-03 14:56:01 -07:00
Sage Weil
4ea24d785b
osd: fix replies to dup/already-committed requests
...
We can safely reply if oldv is _older_ than what's on disk. Otherwise the
request ends up on the list and never gets removed again.
Signed-off-by: Sage Weil <sage@newdream.net>
2010-08-03 11:07:58 -07:00
Sage Weil
930ef4e563
Merge branch 'testing' into unstable
2010-08-03 09:43:09 -07:00
Sage Weil
22a7d42b58
assert: only include acconfig.h ifdef __CEPH__
...
Signed-off-by: Sage Weil <sage@newdream.net>
2010-08-03 09:42:26 -07:00
Takuya ASADA
0ffb08c8b3
librados.hpp fix
...
[ The following text is in the "UTF-8" character set. ]
[ Your display is set for the "iso-8859-1" character set. ]
[ Some characters may be displayed incorrectly. ]
Hi,
I just realized librados.hpp could compile only if "using namespace
std;" is declared before "#include <rados/librados.hpp>", because
"vector" used without std namespace, and I think it's wrong.
It can fix following patch.
syuu
Signed-off-by: Sage Weil <sage@newdream.net>
2010-08-03 09:40:50 -07:00
Sage Weil
be7d84b2b4
mon: fix signed/unsigned compile warning
2010-08-03 09:39:01 -07:00
Sage Weil
4bcba121ac
osd: fix map sharing with old heartbeat peers
...
The addr is in old_inst, since it's an old peer. Fixes a crash like
osd/OSD.cc: In function 'void OSD::_share_map_outgoing(const entity_inst_t&)':
osd/OSD.cc:1791: FAILED assert(inst.name.is_osd())
1: (OSD::update_heartbeat_peers()+0x1d3f) [0x4da66f]
2: (OSD::activate_map(ObjectStore::Transaction&, std::list<Context*, std::allocator<Context*> >&)+0x8ee) [0x4db61e]
3: (OSD::handle_osd_map(MOSDMap*)+0x233a) [0x4e506a]
4: (OSD::_dispatch(Message*)+0x230) [0x4ef400]
5: (OSD::ms_dispatch(Message*)+0x39) [0x4efe39]
6: (SimpleMessenger::dispatch_entry()+0x749) [0x461fa9]
7: (SimpleMessenger::DispatchThread::entry()+0x1c) [0x458f6c]
8: (Thread::_entry_func(void*)+0xa) [0x46cf1a]
9: (()+0x69ca) [0x7f978d6fb9ca]
10: (clone()+0x6d) [0x7f978c91b6cd]
introduced by 9bfb8da9f9
.
Signed-off-by: Sage Weil <sage@newdream.net>
2010-08-03 09:39:01 -07:00
Sage Weil
6573635ba4
mds: fix cap encoding skipping when snaprealm differs
...
We were avoiding adding a new cap, but _any_ issue is problematic, not just
adds (which we can't really be sure about anyway due to races with client
cap release).
Signed-off-by: Sage Weil <sage@newdream.net>
2010-08-02 16:27:44 -07:00
Sage Weil
ccdfcd3947
osdmap: show flags
...
Signed-off-by: Sage Weil <sage@newdream.net>
2010-08-02 16:01:44 -07:00
Greg Farnum
d9a97ac4eb
Merge branch 'locks' into unstable
2010-08-02 15:36:26 -07:00
Greg Farnum
0b964c3d4e
msgr: Add CEPH_FEATURE_FLOCK to default features set, remove extraneous data from protocol
2010-08-02 15:35:59 -07:00
Greg Farnum
aed240ca16
ceph_fs: use __le64 instead of __u64 for over-the-wire data
2010-08-02 15:35:59 -07:00
Greg Farnum
f30efb281e
mds: new low-level debug output, and turn down previous debugs
2010-08-02 15:35:41 -07:00
Thomas Mueller
3e42191b3d
debian: add ceph-client-tools dep to ceph
...
Signed-off-by: Thomas Mueller <thomas@chaschperli.ch>
Signed-off-by: Sage Weil <sage@newdream.net>
2010-08-02 13:27:16 -07:00
Thomas Mueller
f725f20385
debian: move utils rbd,rados,csyn to ceph-client-tools
...
Signed-off-by: Thomas Mueller <thomas@chaschperli.ch>
Signed-off-by: Sage Weil <sage@newdream.net>
2010-08-02 13:26:30 -07:00