Merge pull request #144 from clearcontainers/sameo/topic/ksm-deadlock

Samuel Ortiz · web-flow · commit 9fc158da6296 · 2017-10-09T23:17:24.000+02:00
ksm: Fix deadlock
diff --git a/ksm.go b/ksm.go
@@ -530,17 +530,19 @@ func (k *ksm) throttle() {
 // kick gets us back to the aggressive setting
 func (k *ksm) kick() {
 	k.Lock()
-	defer k.Unlock()
 
 	if !k.initialized {
 		proxyLog.Error(errors.New("KSM is unavailable"))
+		k.Unlock()
 		return
 	}
 
 	// If we're not throttling, we must not kick.
 	if !k.throttling {
+		k.Unlock()
 		return
 	}
 
+	k.Unlock()
 	k.kickChannel <- true
 }

Original file line number	Diff line number	Diff line change
`@@ -530,17 +530,19 @@ func (k *ksm) throttle() {`
`530`	`530`	`// kick gets us back to the aggressive setting`
`531`	`531`	`func (k *ksm) kick() {`
`532`	`532`	`k.Lock()`
`533`		`- defer k.Unlock()`
`534`	`533`
`535`	`534`	`if !k.initialized {`
`536`	`535`	`proxyLog.Error(errors.New("KSM is unavailable"))`
	`536`	`+ k.Unlock()`
`537`	`537`	`return`
`538`	`538`	`}`
`539`	`539`
`540`	`540`	`// If we're not throttling, we must not kick.`
`541`	`541`	`if !k.throttling {`
	`542`	`+ k.Unlock()`
`542`	`543`	`return`
`543`	`544`	`}`
`544`	`545`
	`546`	`+ k.Unlock()`
`545`	`547`	`k.kickChannel <- true`
`546`	`548`	`}`