diff options
author | Keith Bostic <keith.bostic@mongodb.com> | 2016-10-06 20:23:29 -0400 |
---|---|---|
committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-10-07 11:23:29 +1100 |
commit | 7b838e2403bf549daf2a8f27f5a67ed80a45f720 (patch) | |
tree | 512a895b75ed243ef37ca8e0cf63bd8048b10baf /src/conn | |
parent | 4aa57e5ed1b0ada49c47be325b83f21c2e5fb56a (diff) | |
download | mongo-7b838e2403bf549daf2a8f27f5a67ed80a45f720.tar.gz |
WT-2948 simplify error handling by making __wt_epoch return never fail (#3080)
If a system call to retrieve a timestamp fails it will now result in a panic. We couldn't find any case where that's a real possibility.
Diffstat (limited to 'src/conn')
-rw-r--r-- | src/conn/conn_log.c | 4 | ||||
-rw-r--r-- | src/conn/conn_stat.c | 2 | ||||
-rw-r--r-- | src/conn/conn_sweep.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/conn/conn_log.c b/src/conn/conn_log.c index 2786526c2fa..34743034877 100644 --- a/src/conn/conn_log.c +++ b/src/conn/conn_log.c @@ -839,10 +839,10 @@ __log_server(void *arg) /* Wait until the next event. */ - WT_ERR(__wt_epoch(session, &start)); + __wt_epoch(session, &start); __wt_cond_auto_wait_signal(session, conn->log_cond, did_work, &signalled); - WT_ERR(__wt_epoch(session, &now)); + __wt_epoch(session, &now); timediff = WT_TIMEDIFF_MS(now, start); } diff --git a/src/conn/conn_stat.c b/src/conn/conn_stat.c index 66979dfd023..d5a31c671c0 100644 --- a/src/conn/conn_stat.c +++ b/src/conn/conn_stat.c @@ -415,7 +415,7 @@ __statlog_log_one(WT_SESSION_IMPL *session, WT_ITEM *path, WT_ITEM *tmp) conn = S2C(session); /* Get the current local time of day. */ - WT_RET(__wt_epoch(session, &ts)); + __wt_epoch(session, &ts); tm = localtime_r(&ts.tv_sec, &_tm); /* Create the logging path name for this time of day. */ diff --git a/src/conn/conn_sweep.c b/src/conn/conn_sweep.c index 03593f8951a..dba37fa2eb0 100644 --- a/src/conn/conn_sweep.c +++ b/src/conn/conn_sweep.c @@ -271,7 +271,7 @@ __sweep_server(void *arg) /* Wait until the next event. */ __wt_cond_wait(session, conn->sweep_cond, conn->sweep_interval * WT_MILLION); - WT_ERR(__wt_seconds(session, &now)); + __wt_seconds(session, &now); WT_STAT_CONN_INCR(session, dh_sweeps); |