Merge pull request vitessio#4729 from techninja1008/master

Fix go panic caused by unaligned atomic fields on certain architectures.
tinyspeck · Mar 19, 2019 · 5d425ed · 5d425ed
2 parents 20bd2bb + e32cc4d
commit 5d425ed
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/go/pools/resource_pool.go b/go/pools/resource_pool.go
@@ -48,19 +48,20 @@ type Resource interface {
 
 // ResourcePool allows you to use a pool of resources.
 type ResourcePool struct {
-	resources   chan resourceWrapper
-	factory     Factory
-	capacity    sync2.AtomicInt64
-	idleTimeout sync2.AtomicDuration
-	idleTimer   *timer.Timer
-
-	// stats
+	// stats. Atomic fields must remain at the top in order to prevent panics on certain architectures.
 	available  sync2.AtomicInt64
 	active     sync2.AtomicInt64
 	inUse      sync2.AtomicInt64
 	waitCount  sync2.AtomicInt64
 	waitTime   sync2.AtomicDuration
 	idleClosed sync2.AtomicInt64
+
+	capacity    sync2.AtomicInt64
+	idleTimeout sync2.AtomicDuration
+
+	resources chan resourceWrapper
+	factory   Factory
+	idleTimer *timer.Timer
 }
 
 type resourceWrapper struct {