Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
681d1530
Commit
681d1530
authored
Aug 18, 2016
by
Marcin Wielgus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix deadlock possibility in federated informer
parent
214c9160
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
11 deletions
+22
-11
federated_informer.go
...tion/pkg/federation-controller/util/federated_informer.go
+22
-11
No files found.
federation/pkg/federation-controller/util/federated_informer.go
View file @
681d1530
...
@@ -344,8 +344,6 @@ func (f *federatedInformerImpl) getReadyClusterUnlocked(name string) (*federatio
...
@@ -344,8 +344,6 @@ func (f *federatedInformerImpl) getReadyClusterUnlocked(name string) (*federatio
// Synced returns true if the view is synced (for the first time)
// Synced returns true if the view is synced (for the first time)
func
(
f
*
federatedInformerImpl
)
ClustersSynced
()
bool
{
func
(
f
*
federatedInformerImpl
)
ClustersSynced
()
bool
{
f
.
Lock
()
defer
f
.
Unlock
()
return
f
.
clusterInformer
.
controller
.
HasSynced
()
return
f
.
clusterInformer
.
controller
.
HasSynced
()
}
}
...
@@ -452,18 +450,31 @@ func (fs *federatedStoreImpl) GetKeyFor(item interface{}) string {
...
@@ -452,18 +450,31 @@ func (fs *federatedStoreImpl) GetKeyFor(item interface{}) string {
// Checks whether stores for all clusters form the lists (and only these) are there and
// Checks whether stores for all clusters form the lists (and only these) are there and
// are synced.
// are synced.
func
(
fs
*
federatedStoreImpl
)
ClustersSynced
(
clusters
[]
*
federation_api
.
Cluster
)
bool
{
func
(
fs
*
federatedStoreImpl
)
ClustersSynced
(
clusters
[]
*
federation_api
.
Cluster
)
bool
{
fs
.
federatedInformer
.
Lock
()
defer
fs
.
federatedInformer
.
Unlock
()
if
len
(
fs
.
federatedInformer
.
targetInformers
)
!=
len
(
clusters
)
{
// Get the list of informers to check under a lock and check it outside.
okSoFar
,
informersToCheck
:=
func
()
(
bool
,
[]
informer
)
{
fs
.
federatedInformer
.
Lock
()
defer
fs
.
federatedInformer
.
Unlock
()
if
len
(
fs
.
federatedInformer
.
targetInformers
)
!=
len
(
clusters
)
{
return
false
,
[]
informer
{}
}
informersToCheck
:=
make
([]
informer
,
0
,
len
(
clusters
))
for
_
,
cluster
:=
range
clusters
{
if
targetInformer
,
found
:=
fs
.
federatedInformer
.
targetInformers
[
cluster
.
Name
];
found
{
informersToCheck
=
append
(
informersToCheck
,
targetInformer
)
}
else
{
return
false
,
[]
informer
{}
}
}
return
true
,
informersToCheck
}()
if
!
okSoFar
{
return
false
return
false
}
}
for
_
,
cluster
:=
range
clusters
{
for
_
,
informerToCheck
:=
range
informersToCheck
{
if
targetInformer
,
found
:=
fs
.
federatedInformer
.
targetInformers
[
cluster
.
Name
];
found
{
if
!
informerToCheck
.
controller
.
HasSynced
()
{
if
!
targetInformer
.
controller
.
HasSynced
()
{
return
false
}
}
else
{
return
false
return
false
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment