Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

storage: replace a few panics with log.Fatal #16482

Merged
merged 1 commit into from
Jun 13, 2017
Merged

storage: replace a few panics with log.Fatal #16482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pkg/storage/replica.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1580,7 +1580,10 @@ func (r *Replica) assertStateLocked(ctx context.Context, reader engine.Reader) {
// TODO(dt): expose properly once #15892 is addressed.
log.Errorf(ctx, "on-disk and in-memory state diverged:\n%s", pretty.Diff(diskState, r.mu.state))
r.mu.state.Desc, diskState.Desc = nil, nil
panic(log.Safe{V: fmt.Sprintf("on-disk and in-memory state diverged: %s", pretty.Diff(diskState, r.mu.state))})
log.Fatal(ctx, log.Safe{
V: fmt.Sprintf("on-disk and in-memory state diverged: %s",
pretty.Diff(diskState, r.mu.state)),
})
}
}

Expand Down Expand Up @@ -4396,7 +4399,7 @@ func (r *Replica) evaluateTxnWriteBatch(
err := roachpb.NewTransactionRetryError(roachpb.RETRY_REASON_UNKNOWN)
return nil, ms, nil, EvalResult{}, roachpb.NewError(err)
}
panic("unreachable")
log.Fatal(ctx, "unreachable")
}

log.VEventf(ctx, 2, "1PC execution failed, reverting to regular execution for batch")
Expand Down
14 changes: 7 additions & 7 deletions pkg/storage/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ func NewStore(cfg StoreConfig, eng engine.Engine, nodeDesc *roachpb.NodeDescript
cfg.SetDefaults()

if !cfg.Valid() {
panic(fmt.Sprintf("invalid store configuration: %+v", &cfg))
log.Fatalf(context.Background(), "invalid store configuration: %+v", &cfg)
}
s := &Store{
cfg: cfg,
Expand Down Expand Up @@ -1387,7 +1387,7 @@ func (s *Store) GossipStore(ctx context.Context) error {
select {
case <-s.cfg.Gossip.Connected:
default:
panic(fmt.Sprintf("%s: not connected to gossip", s))
log.Fatalf(ctx, "not connected to gossip")
}

storeDesc, err := s.Descriptor()
Expand Down Expand Up @@ -2854,7 +2854,7 @@ func (s *Store) HandleRaftRequest(
) *roachpb.Error {
if len(req.Heartbeats)+len(req.HeartbeatResps) > 0 {
if req.RangeID != 0 {
panic("coalesced heartbeats must have rangeID == 0")
log.Fatalf(ctx, "coalesced heartbeats must have rangeID == 0")
}
s.uncoalesceBeats(ctx, req.Heartbeats, req.FromReplica, req.ToReplica, raftpb.MsgHeartbeat, respStream)
s.uncoalesceBeats(ctx, req.HeartbeatResps, req.FromReplica, req.ToReplica, raftpb.MsgHeartbeatResp, respStream)
Expand Down Expand Up @@ -2915,7 +2915,7 @@ func (s *Store) processRaftRequest(

if req.Quiesce {
if req.Message.Type != raftpb.MsgHeartbeat {
panic(fmt.Sprintf("unexpected quiesce: %+v", req))
log.Fatalf(ctx, "unexpected quiesce: %+v", req)
}
status := r.RaftStatus()
if status != nil && status.Term == req.Message.Term && status.Commit == req.Message.Commit {
Expand Down Expand Up @@ -3150,7 +3150,7 @@ func (s *Store) processRaftRequest(

if _, err := r.handleRaftReadyRaftMuLocked(inSnap); err != nil {
// mimic the behavior in processRaft.
panic(err)
log.Fatal(ctx, err)
}
removePlaceholder = false
return nil
Expand Down Expand Up @@ -3450,7 +3450,7 @@ func (s *Store) processReady(rangeID roachpb.RangeID) {
if ok {
stats, err := r.handleRaftReady(IncomingSnapshot{})
if err != nil {
panic(err) // TODO(bdarnell)
log.Fatal(r.AnnotateCtx(context.Background()), err) // TODO(bdarnell)
}
elapsed := timeutil.Since(start)
s.metrics.RaftWorkingDurationNanos.Inc(elapsed.Nanoseconds())
Expand Down Expand Up @@ -3579,7 +3579,7 @@ func (s *Store) sendQueuedHeartbeatsToNode(
} else if len(beats) == 0 {
msgType = raftpb.MsgHeartbeatResp
} else {
panic("cannot coalesce both heartbeats and responses")
log.Fatal(s.AnnotateCtx(context.Background()), "cannot coalesce both heartbeats and responses")
}

chReq := &RaftMessageRequest{
Expand Down