scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move HighWaterMark to the top of the struct in order to fix arm, second time

Browse Source
This commit is contained in:
Lucas Käldström
2016-09-23 20:58:28 +03:00
parent 46197a5d13
commit 06917531b3
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/controller_utils.go
View File

@@ -219,6 +219,8 @@ type Expectations interface {
// ControlleeExpectations track controllee creates/deletes. // ControlleeExpectations track controllee creates/deletes.
type ControlleeExpectations struct { type ControlleeExpectations struct {
// Important: Since these two int64 fields are using sync/atomic, they have to be at the top of the struct due to a bug on 32-bit platforms
// See: https://golang.org/pkg/sync/atomic/ for more information
add int64 add int64
del int64 del int64
key string key string

7
pkg/genericapiserver/tunneler.go
View File

@@ -46,14 +46,17 @@ type Tunneler interface {
} }
type SSHTunneler struct { type SSHTunneler struct {
// Important: Since these two int64 fields are using sync/atomic, they have to be at the top of the struct due to a bug on 32-bit platforms
// See: https://golang.org/pkg/sync/atomic/ for more information
lastSync int64 // Seconds since Epoch
lastSSHKeySync int64 // Seconds since Epoch
SSHUser string SSHUser string
SSHKeyfile string SSHKeyfile string
InstallSSHKey InstallSSHKey InstallSSHKey InstallSSHKey
HealthCheckURL *url.URL HealthCheckURL *url.URL
tunnels *ssh.SSHTunnelList tunnels *ssh.SSHTunnelList
lastSync int64 // Seconds since Epoch
lastSSHKeySync int64 // Seconds since Epoch
lastSyncMetric prometheus.GaugeFunc lastSyncMetric prometheus.GaugeFunc
clock clock.Clock clock clock.Clock

11
pkg/storage/cacher.go
View File

@@ -130,6 +130,13 @@ func (i *indexedWatchers) terminateAll(objectType reflect.Type) {
// Cacher implements storage.Interface (although most of the calls are just // Cacher implements storage.Interface (although most of the calls are just
// delegated to the underlying storage). // delegated to the underlying storage).
type Cacher struct { type Cacher struct {
// HighWaterMarks for performance debugging.
// Important: Since HighWaterMark is using sync/atomic, it has to be at the top of the struct due to a bug on 32-bit platforms
// See: https://golang.org/pkg/sync/atomic/ for more information
incomingHWM HighWaterMark
// Incoming events that should be dispatched to watchers.
incoming chan watchCacheEvent
sync.RWMutex sync.RWMutex
// Before accessing the cacher's cache, wait for the ready to be ok. // Before accessing the cacher's cache, wait for the ready to be ok.
@@ -164,10 +171,6 @@ type Cacher struct {
watcherIdx int watcherIdx int
watchers indexedWatchers watchers indexedWatchers
// Incoming events that should be dispatched to watchers.
incoming chan watchCacheEvent
incomingHWM HighWaterMark
// Handling graceful termination. // Handling graceful termination.
stopLock sync.RWMutex stopLock sync.RWMutex
stopped bool stopped bool