Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Kirill Smelkov
neo
Commits
3e13fa06
Commit
3e13fa06
authored
Nov 04, 2022
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
a875f56c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
go/neo/master.go
go/neo/master.go
+2
-2
go/neo/storage.go
go/neo/storage.go
+4
-4
go/neo/xneo/parttab.go
go/neo/xneo/parttab.go
+2
-2
No files found.
go/neo/master.go
View file @
3e13fa06
// Copyright (C) 2017-202
1
Nexedi SA and Contributors.
// Copyright (C) 2017-202
2
Nexedi SA and Contributors.
// Kirill Smelkov <kirr@nexedi.com>
// Kirill Smelkov <kirr@nexedi.com>
//
//
// This program is free software: you can Use, Study, Modify and Redistribute
// This program is free software: you can Use, Study, Modify and Redistribute
...
@@ -285,7 +285,7 @@ func (m *Master) Run(ctx context.Context, l xnet.Listener) (err error) {
...
@@ -285,7 +285,7 @@ func (m *Master) Run(ctx context.Context, l xnet.Listener) (err error) {
m
.
mainWG
.
Go
(
m
.
main
)
m
.
mainWG
.
Go
(
m
.
main
)
err
=
m
.
mainWG
.
Wait
()
err
=
m
.
mainWG
.
Wait
()
// change `... canceled` to just canceled
?
// change `... canceled` to just canceled
// (e.g. `master: listen: canceled` or `master: main: canceled` -> `master: canceled`)
// (e.g. `master: listen: canceled` or `master: main: canceled` -> `master: canceled`)
if
ctx
.
Err
()
!=
nil
{
if
ctx
.
Err
()
!=
nil
{
err
=
ctx
.
Err
()
err
=
ctx
.
Err
()
...
...
go/neo/storage.go
View file @
3e13fa06
// Copyright (C) 2016-202
1
Nexedi SA and Contributors.
// Copyright (C) 2016-202
2
Nexedi SA and Contributors.
// Kirill Smelkov <kirr@nexedi.com>
// Kirill Smelkov <kirr@nexedi.com>
//
//
// This program is free software: you can Use, Study, Modify and Redistribute
// This program is free software: you can Use, Study, Modify and Redistribute
...
@@ -116,7 +116,7 @@ func (stor *Storage) Run(ctx context.Context, l xnet.Listener) (err error) {
...
@@ -116,7 +116,7 @@ func (stor *Storage) Run(ctx context.Context, l xnet.Listener) (err error) {
})
})
}
}
// m1initialize drives storage by master messages during initialization phase
// m1initialize drives storage by master messages during initialization phase
.
//
//
// Initialization includes master retrieving info for cluster recovery and data
// Initialization includes master retrieving info for cluster recovery and data
// verification before starting operation. Initialization finishes either
// verification before starting operation. Initialization finishes either
...
@@ -149,7 +149,7 @@ func (stor *Storage) m1initialize(ctx context.Context, mlink *_MasterLink) (reqS
...
@@ -149,7 +149,7 @@ func (stor *Storage) m1initialize(ctx context.Context, mlink *_MasterLink) (reqS
var
cmdStart
=
errors
.
New
(
"start requested"
)
var
cmdStart
=
errors
.
New
(
"start requested"
)
// m1initialize1 handles one message from master from under m1initialize
// m1initialize1 handles one message from master from under m1initialize
.
func
(
stor
*
Storage
)
m1initialize1
(
ctx
context
.
Context
,
req
neonet
.
Request
)
error
{
func
(
stor
*
Storage
)
m1initialize1
(
ctx
context
.
Context
,
req
neonet
.
Request
)
error
{
var
err
error
var
err
error
...
@@ -290,7 +290,7 @@ func (stor *Storage) serve(ctx context.Context) (err error) {
...
@@ -290,7 +290,7 @@ func (stor *Storage) serve(ctx context.Context) (err error) {
err
:=
xio
.
WithCloseOnRetCancel
(
ctx
,
req
.
Link
(),
func
()
error
{
err
:=
xio
.
WithCloseOnRetCancel
(
ctx
,
req
.
Link
(),
func
()
error
{
return
stor
.
serveLink
(
ctx
,
req
,
idReq
)
return
stor
.
serveLink
(
ctx
,
req
,
idReq
)
})
})
if
err
=
=
nil
{
if
err
!
=
nil
{
if
ctx
.
Err
()
==
nil
{
if
ctx
.
Err
()
==
nil
{
// the error is not due to serve cancel
// the error is not due to serve cancel
log
.
Error
(
ctx
,
err
)
log
.
Error
(
ctx
,
err
)
...
...
go/neo/xneo/parttab.go
View file @
3e13fa06
// Copyright (C) 2017-202
1
Nexedi SA and Contributors.
// Copyright (C) 2017-202
2
Nexedi SA and Contributors.
// Kirill Smelkov <kirr@nexedi.com>
// Kirill Smelkov <kirr@nexedi.com>
//
//
// This program is free software: you can Use, Study, Modify and Redistribute
// This program is free software: you can Use, Study, Modify and Redistribute
...
@@ -28,7 +28,7 @@ import (
...
@@ -28,7 +28,7 @@ import (
"lab.nexedi.com/kirr/neo/go/neo/proto"
"lab.nexedi.com/kirr/neo/go/neo/proto"
)
)
// PartitionTable represents object space partitioning in a cluster
// PartitionTable represents object space partitioning in a cluster
.
//
//
// It is
// It is
//
//
...
...
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