Revision 0888ae48
src/client/Client.cc | ||
---|---|---|
227 | 227 |
const xmlrpc_c::paramList& plist, unsigned int _timeout, |
228 | 228 |
xmlrpc_c::value * const result, std::string& error) |
229 | 229 |
{ |
230 |
/* |
|
231 |
xmlrpc may raise if there is outstanding curl work |
|
232 |
|
|
230 | 233 |
xmlrpc_c::clientXmlTransport_curl transport( |
231 | 234 |
xmlrpc_c::clientXmlTransport_curl::constrOpt().timeout(_timeout)); |
235 |
*/ |
|
236 |
xmlrpc_c::clientXmlTransport_curl transport; |
|
232 | 237 |
|
233 | 238 |
xmlrpc_c::carriageParm_curl0 carriage(endpoint); |
234 | 239 |
|
src/raft/ReplicaManager.cc | ||
---|---|---|
60 | 60 |
{ |
61 | 61 |
it->second->finalize(); |
62 | 62 |
|
63 |
pthread_cancel(it->second->thread_id()); |
|
64 |
|
|
63 | 65 |
delete it->second; |
64 | 66 |
} |
65 | 67 |
|
src/raft/ReplicaThread.cc | ||
---|---|---|
38 | 38 |
{ |
39 | 39 |
ReplicaThread * rt; |
40 | 40 |
|
41 |
int oldstate; |
|
42 |
|
|
41 | 43 |
if ( arg == 0 ) |
42 | 44 |
{ |
43 | 45 |
return 0; |
... | ... | |
47 | 49 |
|
48 | 50 |
rt->_thread_id = pthread_self(); |
49 | 51 |
|
52 |
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate); |
|
53 |
|
|
54 |
pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &oldstate); |
|
55 |
|
|
50 | 56 |
rt->do_replication(); |
51 | 57 |
|
52 | 58 |
return 0; |
src/rm/RequestManagerZone.cc | ||
---|---|---|
381 | 381 |
} |
382 | 382 |
} |
383 | 383 |
|
384 |
if ( logdb->get_log_record(index, lr) != 0 )
|
|
384 |
if ( logdb->get_log_record(index, lr) == 0 )
|
|
385 | 385 |
{ |
386 | 386 |
if ( lr.term != term ) |
387 | 387 |
{ |
388 | 388 |
logdb->delete_log_records(index); |
389 | 389 |
} |
390 |
else //Already a log record with same index and term |
|
391 |
{ |
|
392 |
success_response(static_cast<int>(current_term), att); |
|
393 |
return; |
|
394 |
} |
|
390 | 395 |
} |
391 | 396 |
|
392 | 397 |
ostringstream sql_oss(sql); |
Also available in: Unified diff