wip

cockroachdb · Jul 5, 2016 · 019826c · 019826c
1 parent 04ca485
commit 019826c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/storage/replica_raftstorage.go b/storage/replica_raftstorage.go
@@ -618,6 +618,9 @@ func (r *Replica) applySnapshot(snap raftpb.Snapshot, hs raftpb.HardState) (uint
 		if raft.IsEmptyHardState(hs) {
 			return 0, errors.Errorf("cannot apply empty HardState on non-preemptive snapshot")
 		}
+		if err := setHardState(batch, desc.RangeID, hs); err != nil {
+			return 0, errors.Wrap(err, "unable to write HardState")
+		}
 	}
 
 	if err := batch.Commit(); err != nil {

diff --git a/storage/replica_state.go b/storage/replica_state.go
@@ -23,6 +23,7 @@ import (
 	"github.com/cockroachdb/cockroach/storage/engine/enginepb"
 	"github.com/cockroachdb/cockroach/storage/storagebase"
 	"github.com/cockroachdb/cockroach/util/hlc"
+	"github.com/cockroachdb/cockroach/util/log"
 	"github.com/cockroachdb/cockroach/util/protoutil"
 	"github.com/coreos/etcd/raft"
 	"github.com/coreos/etcd/raft/raftpb"
@@ -347,6 +348,7 @@ func updateHardState(eng engine.ReadWriter, s storagebase.ReplicaState) error {
 		newHS.Vote = oldHS.Vote
 	}
 
+	log.Warningf("SHS %+v", newHS)
 	return setHardState(eng, rangeID, newHS)
 }