Merge pull request #7673 from tschottdorf/disable-parallel-raft

storage: disable handleRaftReady concurrency
cockroachdb · Jul 7, 2016 · 36b0edc · 36b0edc
2 parents 36edf3a + 8c02f0c
commit 36b0edc
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/storage/store.go b/storage/store.go
@@ -19,7 +19,6 @@ package storage
 import (
 	"bytes"
 	"fmt"
-	"runtime"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -86,7 +85,9 @@ var changeTypeInternalToRaft = map[roachpb.ReplicaChangeType]raftpb.ConfChangeTy
 	roachpb.REMOVE_REPLICA: raftpb.ConfChangeRemoveNode,
 }
 
-var storeReplicaRaftReadyConcurrency = 2 * runtime.NumCPU()
+// TODO(tschottdorf): It's currently unsafe to set this to any other value due
+// to concurrency issues. See #7672 and the discussion within.
+const storeReplicaRaftReadyConcurrency = 1
 
 // TestStoreContext has some fields initialized with values relevant
 // in tests.