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

[dbnode] Fix node serving reads/marked bootstrapped after bootstrap failure #3088

Merged
merged 4 commits into from
Jan 15, 2021
Merged

[dbnode] Fix node serving reads/marked bootstrapped after bootstrap failure #3088

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
039bea8
set bootstrap state to Bootstrapped when it returns no errors
soundvibe Jan 14, 2021
4adb329
added bootstrap regression test.
soundvibe Jan 14, 2021
173ed0d
removed new test and updated old test to check for bootstrap states.
soundvibe Jan 15, 2021
9173cac
Merge branch 'master' into linasn/bootstrapped-state-fix
soundvibe Jan 15, 2021
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
3 changes: 1 addition & 2 deletions src/dbnode/storage/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,6 @@ func (m *bootstrapManager) Bootstrap() (BootstrapResult, error) {
if currPending {
// New bootstrap calls should now enqueue another pending bootstrap
m.hasPending = false
} else {
m.state = Bootstrapped
}
m.Unlock()

Expand Down Expand Up @@ -186,6 +184,7 @@ func (m *bootstrapManager) Bootstrap() (BootstrapResult, error) {
// across the cluster.
m.Lock()
m.lastBootstrapCompletionTime = xtime.ToUnixNano(m.nowFn())
m.state = Bootstrapped
m.Unlock()
return result, nil
}
Expand Down