luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Fix local check on singleton required mounts

This commit is contained in:
Jeff Mitchell 2017-05-09 08:36:10 -04:00
parent a3191995e6
commit e3c8be72cc
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vault/mount.go
View File

@ -519,8 +519,9 @@ func (c *Core) loadMounts() error {
// This should only happen in the upgrade case where a new one is // This should only happen in the upgrade case where a new one is
// introduced on the primary; otherwise initial bootstrapping will // introduced on the primary; otherwise initial bootstrapping will
// ensure this comes over. If we upgrade first, we simply don't // ensure this comes over. If we upgrade first, we simply don't
// create the mount, so we won't conflict when we sync. // create the mount, so we won't conflict when we sync. If this is
if !foundRequired && c.replicationState != consts.ReplicationSecondary { // local (e.g. cubbyhole) we do still add it.
if !foundRequired && (c.replicationState != consts.ReplicationSecondary || requiredMount.Local) {
c.mounts.Entries = append(c.mounts.Entries, requiredMount) c.mounts.Entries = append(c.mounts.Entries, requiredMount)
needPersist = true needPersist = true
} }
@ -805,14 +806,15 @@ func requiredMountTable() *MountTable {
// for replication, so we can send over mount info (especially, UUIDs of // for replication, so we can send over mount info (especially, UUIDs of
// mounts, which are used for salts) for mounts that may not be able to be // mounts, which are used for salts) for mounts that may not be able to be
// handled normally. After saving these values on the secondary, we let normal // handled normally. After saving these values on the secondary, we let normal
// sync invalidation do its thing. // sync invalidation do its thing. Because of its use for replication, we
// exclude local mounts.
func (c *Core) singletonMountTables() (mounts, auth *MountTable) { func (c *Core) singletonMountTables() (mounts, auth *MountTable) {
mounts = &MountTable{} mounts = &MountTable{}
auth = &MountTable{} auth = &MountTable{}
c.mountsLock.RLock() c.mountsLock.RLock()
for _, entry := range c.mounts.Entries { for _, entry := range c.mounts.Entries {
if strutil.StrListContains(singletonMounts, entry.Type) { if strutil.StrListContains(singletonMounts, entry.Type) && !entry.Local {
mounts.Entries = append(mounts.Entries, entry) mounts.Entries = append(mounts.Entries, entry)
} }
} }
@ -820,7 +822,7 @@ func (c *Core) singletonMountTables() (mounts, auth *MountTable) {
c.authLock.RLock() c.authLock.RLock()
for _, entry := range c.auth.Entries { for _, entry := range c.auth.Entries {
if strutil.StrListContains(singletonMounts, entry.Type) { if strutil.StrListContains(singletonMounts, entry.Type) && !entry.Local {
auth.Entries = append(auth.Entries, entry) auth.Entries = append(auth.Entries, entry)
} }
} }