mirror of
https://github.com/ceph/ceph
synced 2025-01-18 17:12:29 +00:00
got the seg fault fixed
git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1061 29311d96-e01e-0410-9327-a35deaab8ce9
This commit is contained in:
parent
d5d4231d56
commit
05c59ebf7c
@ -28,18 +28,18 @@ class MonMap {
|
||||
epoch_t epoch; // what epoch of the osd cluster descriptor is this
|
||||
int num_mon;
|
||||
vector<entity_inst_t> mon_inst;
|
||||
int last_mon; // last mon i talked to
|
||||
string pub_str_key;
|
||||
esignPub pub_key;
|
||||
bool keyConvert;
|
||||
|
||||
int last_mon; // last mon i talked to
|
||||
|
||||
// MonMap(int s=0) : epoch(0), num_mon(s), mon_inst(s),
|
||||
// last_mon(-1), keyConvert(false) {}
|
||||
MonMap(int s=0) : epoch(0), num_mon(s), mon_inst(s), last_mon(-1) {
|
||||
keyConvert = false;
|
||||
}
|
||||
// the map constructor when I have a key
|
||||
MonMap(int s=0,string key=NULL) : epoch(0), num_mon(s), mon_inst(s),
|
||||
last_mon(-1),
|
||||
pub_str_key(key), keyConvert(false){}
|
||||
MonMap(int s,string key) : epoch(0), num_mon(s), mon_inst(s), last_mon(-1),
|
||||
pub_str_key(key), keyConvert(false) {
|
||||
}
|
||||
|
||||
void add_mon(entity_inst_t inst) {
|
||||
mon_inst.push_back(inst);
|
||||
@ -80,7 +80,7 @@ class MonMap {
|
||||
blist.append((char*)&num_mon, sizeof(num_mon));
|
||||
|
||||
_encode(mon_inst, blist);
|
||||
_encode(pub_str_key, blist);
|
||||
//_encode(pub_str_key, blist);
|
||||
}
|
||||
|
||||
void decode(bufferlist& blist) {
|
||||
@ -91,7 +91,7 @@ class MonMap {
|
||||
off += sizeof(num_mon);
|
||||
|
||||
_decode(mon_inst, blist, off);
|
||||
_decode(pub_str_key, blist, off);
|
||||
//_decode(pub_str_key, blist, off);
|
||||
}
|
||||
|
||||
int write(char *fn) {
|
||||
|
Loading…
Reference in New Issue
Block a user