RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 18:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,935 Commits 216 Branches 394 Tags 1.9 GiB
c26cb7276f
Commit Graph

10935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Thomas Mueller
c61a6c32f3 debian: move mount.ceph 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:27 -07:00
Sage Weil
3fc47c2e35 Merge branch 'testing' into unstable 2010-08-02 13:26:23 -07:00
Sage Weil
9ccf9cb6c5 debian: move fuse-utils dep to ceph-fuse 
Reported-by: Thomas Mueller <thomas@chaschperli.ch>
Signed-off-by: Sage Weil <sage@newdream.net>
 2010-08-02 13:26:09 -07:00
Christian Brunner
baa69ad7ce cclass: fix .so loading file 
The only thing I've found, is that the *.so files are included in the -devel
rpm. This leads to the fact that the 'find' in cclass doesn't return any
files. I'd suggest the attached change in the script.

Christian

Signed-off-by: Sage Weil <sage@newdream.net>
 2010-08-02 13:23:55 -07:00
Sage Weil
9bfb8da9f9 osd: send latest osdmap when we stop sending heartbeats to peer 
Otherwise, they may still expect them, and may mark us down.
 2010-08-02 13:23:55 -07:00
Sage Weil
4a7c3553a7 osd: avoid most of handle_osd_map if there are no new maps in message 
We don't want to take the time to flush things to disk and shut down all
the worker threads if there is nothing new in the osdmap update (as is
usually the case).

Signed-off-by: Sage Weil <sage@newdream.net>
 2010-08-02 13:23:55 -07:00
Sage Weil
025bce64f4 osd: send heartbeat request from update_heartbeat_peers 
This keeps our from_stamps in a consistent state, and sends the hb request
sooner rather than later.

Signed-off-by: Sage Weil <sage@newdream.net>
 2010-08-02 13:14:52 -07:00
Sage Weil
30cdc3dde5 mon: drop redundant pg_temp mappings 2010-08-02 13:13:06 -07:00
Sage Weil
90a2f2010e mon: make backward-compat mon id's start at '0', not 'a' 
Signed-off-by: Sage Weil <sage@newdream.net>
 2010-08-02 13:13:06 -07:00
Sage Weil
88c17f423a osd: add asserts when indexing pg log by reqid 
This should help catch callers that submit dup entries with the same
request id, causing other problems down the line.
 2010-08-02 12:32:06 -07:00
Greg Farnum
e555ac67c9 mds: recover filelocks properly on client reconnect 2010-08-02 10:39:56 -07:00
Greg Farnum
e501da4b8e mds: debug output and some comments. 2010-08-02 10:39:56 -07:00
Greg Farnum
eb669ad2f1 mds: locking. Compare iterator to right list! 2010-08-02 10:39:56 -07:00
Greg Farnum
c0eccba39b mds: locking. Fix waiting lock count map deletion 2010-08-02 10:39:56 -07:00