Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix data race in local membership #687

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix data race in local membership #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions token/services/identity/msp/idemix/lm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ func (l *LocalMembership) GetIdentifier(id driver.Identity) (string, error) {
}

func (l *LocalMembership) GetDefaultIdentifier() string {
l.resolversMutex.RLock()
defer l.resolversMutex.RUnlock()
return l.getDefaultIdentifier()
}

func (l *LocalMembership) getDefaultIdentifier() string {
for _, resolver := range l.resolvers {
if resolver.Default {
return resolver.Name
Expand Down Expand Up @@ -148,7 +154,7 @@ func (l *LocalMembership) RegisterIdentity(idConfig driver.IdentityConfiguration
l.resolversMutex.Lock()
defer l.resolversMutex.Unlock()

return l.registerIdentityConfiguration(idConfig, l.GetDefaultIdentifier() == "")
return l.registerIdentityConfiguration(idConfig, l.getDefaultIdentifier() == "")
}

func (l *LocalMembership) IDs() ([]string, error) {
Expand Down Expand Up @@ -187,7 +193,7 @@ func (l *LocalMembership) Load() error {
logger.Debugf("load identities from storage...done")

// if no default identity, use the first one
defaultIdentifier := l.GetDefaultIdentifier()
defaultIdentifier := l.getDefaultIdentifier()
if len(defaultIdentifier) == 0 {
logger.Warnf("no default identity, use the first one available")
if len(l.resolvers) > 0 {
Expand Down Expand Up @@ -385,7 +391,7 @@ func (l *LocalMembership) loadFromStorage() error {
URL: entry.URL,
Config: entry.Config,
Raw: entry.Raw,
}, l.GetDefaultIdentifier() == ""); err != nil {
}, l.getDefaultIdentifier() == ""); err != nil {
return err
}
}
Expand Down
10 changes: 8 additions & 2 deletions token/services/identity/msp/x509/lm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func (lm *LocalMembership) Load(identities []*config.Identity) error {
logger.Debugf("load identities from storage...done")

// if no default identity, use the first one
defaultIdentifier := lm.GetDefaultIdentifier()
defaultIdentifier := lm.getDefaultIdentifier()
if len(defaultIdentifier) == 0 {
logger.Warnf("no default identity, use the first one available")
if len(lm.resolvers) > 0 {
Expand Down Expand Up @@ -134,6 +134,12 @@ func (lm *LocalMembership) GetIdentifier(id driver.Identity) (string, error) {
}

func (lm *LocalMembership) GetDefaultIdentifier() string {
lm.resolversMutex.RLock()
defer lm.resolversMutex.RUnlock()
return lm.getDefaultIdentifier()
}

func (lm *LocalMembership) getDefaultIdentifier() string {
for _, resolver := range lm.resolvers {
if resolver.Default {
return resolver.Name
Expand Down Expand Up @@ -180,7 +186,7 @@ func (lm *LocalMembership) RegisterIdentity(idConfig driver.IdentityConfiguratio
return errors.Wrapf(err, "failed to load msp config [%s]", idConfig.ID)
}
}
return lm.registerIdentity(mspConfig, identityConfig, lm.GetDefaultIdentifier() == "")
return lm.registerIdentity(mspConfig, identityConfig, lm.getDefaultIdentifier() == "")
}

func (lm *LocalMembership) IDs() ([]string, error) {
Expand Down
Loading