NBD integration into controller and replica #1109
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,12 +18,12 @@ func New(factories map[string]types.BackendFactory) types.BackendFactory { | |
| } | ||
| } | ||
|
|
||
| func (d *Factory) Create(volumeName, address string, dataServerProtocol types.DataServerProtocol, engineToReplicaTimeout time.Duration, nbdEnabled int) (types.Backend, error) { | ||
|
There was a problem hiding this comment. 🛠️ Refactor suggestion Consider using a more semantic type for nbdEnabled Using Consider one of these alternatives: -func (d *Factory) Create(volumeName, address string, dataServerProtocol types.DataServerProtocol, engineToReplicaTimeout time.Duration, nbdEnabled int) (types.Backend, error) {
+// Option 1: Use boolean
+func (d *Factory) Create(volumeName, address string, dataServerProtocol types.DataServerProtocol, engineToReplicaTimeout time.Duration, nbdEnabled bool) (types.Backend, error) {
+// Option 2: Use custom type for clarity
+type NBDMode int
+const (
+ NBDDisabled NBDMode = iota
+ NBDEnabled
+)
+func (d *Factory) Create(volumeName, address string, dataServerProtocol types.DataServerProtocol, engineToReplicaTimeout time.Duration, nbdMode NBDMode) (types.Backend, error) {
|
||
| parts := strings.SplitN(address, "://", 2) | ||
|
|
||
| if len(parts) == 2 { | ||
| if factory, ok := d.factories[parts[0]]; ok { | ||
| return factory.Create(volumeName, parts[1], dataServerProtocol, engineToReplicaTimeout, nbdEnabled) | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -124,7 +124,7 @@ func (f *Wrapper) ResetRebuild() error { | |
| return nil | ||
| } | ||
|
|
||
| func (ff *Factory) Create(volumeName, address string, dataServerProtocol types.DataServerProtocol, engineToReplicaTimeout time.Duration, nbdEnabled int) (types.Backend, error) { | ||
| logrus.Infof("Creating file: %s", address) | ||
| file, err := os.OpenFile(address, os.O_RDWR|os.O_CREATE, 0600) | ||
| if err != nil { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -329,7 +329,7 @@ func (r *Remote) info() (*types.ReplicaInfo, error) { | |
| return replicaClient.GetReplicaInfo(resp.Replica), nil | ||
| } | ||
|
|
||
| func (rf *Factory) Create(volumeName, address string, dataServerProtocol types.DataServerProtocol, engineToReplicaTimeout time.Duration, nbdEnabled int) (types.Backend, error) { | ||
| logrus.Infof("Connecting to remote: %s (%v)", address, dataServerProtocol) | ||
|
|
||
| controlAddress, dataAddress, _, _, err := util.GetAddresses(volumeName, address, dataServerProtocol) | ||
|
|
@@ -360,15 +360,22 @@ func (rf *Factory) Create(volumeName, address string, dataServerProtocol types.D | |
| if err != nil { | ||
| return nil, err | ||
| } | ||
| var dataConnClient *dataconn.Client | ||
| if nbdEnabled > 0 { | ||
| dataConnClientNBD := dataconn.NewNbdClientWrapper(conn, engineToReplicaTimeout, nbdEnabled) | ||
| r.ReaderWriterUnmapperAt = dataConnClientNBD | ||
| } else { | ||
| dataConnClient = dataconn.NewClient(conn, engineToReplicaTimeout) | ||
| r.ReaderWriterUnmapperAt = dataConnClient | ||
| } | ||
|
|
||
| if err := r.open(); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if nbdEnabled == 0 { | ||
| go r.monitorPing(dataConnClient) | ||
| } | ||
|
|
||
| return r, nil | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,10 +30,12 @@ type Controller struct { | |
| factory types.BackendFactory | ||
| backend *replicator | ||
| frontend types.Frontend | ||
| frontendStreams int | ||
| isUpgrade bool | ||
| iscsiTargetRequestTimeout time.Duration | ||
| engineReplicaTimeout time.Duration | ||
| DataServerProtocol types.DataServerProtocol | ||
| nbdEnabled int | ||
|
|
||
| isExpanding bool | ||
| revisionCounterDisabled bool | ||
|
|
@@ -66,14 +68,15 @@ const ( | |
| lastModifyCheckPeriod = 5 * time.Second | ||
| ) | ||
|
|
||
| func NewController(name string, factory types.BackendFactory, frontend types.Frontend, frontendStreams int, isUpgrade, disableRevCounter, salvageRequested, unmapMarkSnapChainRemoved bool, | ||
| iscsiTargetRequestTimeout, engineReplicaTimeout time.Duration, dataServerProtocol types.DataServerProtocol, fileSyncHTTPClientTimeout int, nbdEnabled int) *Controller { | ||
| c := &Controller{ | ||
| factory: factory, | ||
| VolumeName: name, | ||
| frontend: frontend, | ||
| frontendStreams: frontendStreams, | ||
| metrics: &types.Metrics{}, | ||
| latestMetrics: &types.Metrics{}, | ||
|
|
||
| isUpgrade: isUpgrade, | ||
| revisionCounterDisabled: disableRevCounter, | ||
|
|
@@ -85,6 +88,7 @@ func NewController(name string, factory types.BackendFactory, frontend types.Fro | |
| DataServerProtocol: dataServerProtocol, | ||
|
|
||
| fileSyncHTTPClientTimeout: fileSyncHTTPClientTimeout, | ||
| nbdEnabled: nbdEnabled, | ||
| } | ||
| c.reset() | ||
| c.metricsStart() | ||
|
|
@@ -164,7 +168,7 @@ func (c *Controller) addReplica(address string, snapshotRequired bool, mode type | |
| return err | ||
| } | ||
|
|
||
| newBackend, err := c.factory.Create(c.VolumeName, address, c.DataServerProtocol, c.engineReplicaTimeout, c.nbdEnabled) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
@@ -484,7 +488,7 @@ func (c *Controller) StartFrontend(frontend string) error { | |
| } | ||
| } | ||
|
|
||
| f, err := NewFrontend(frontend, c.frontendStreams, c.iscsiTargetRequestTimeout) | ||
| if err != nil { | ||
| return errors.Wrapf(err, "failed to find frontend: %s", frontend) | ||
| } | ||
|
|
@@ -728,7 +732,7 @@ func (c *Controller) Start(volumeSize, volumeCurrentSize int64, addresses ...str | |
| errorCodes := map[string]codes.Code{} | ||
| first := true | ||
| for _, address := range addresses { | ||
| newBackend, err := c.factory.Create(c.VolumeName, address, c.DataServerProtocol, c.engineReplicaTimeout, c.nbdEnabled) | ||
| if err != nil { | ||
| if strings.Contains(err.Error(), "rpc error: code = Unavailable") { | ||
| errorCodes[address] = codes.Unavailable | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider version pinning and build verification for libnbd
The current implementation downloads libnbd without verifying the checksum. Additionally, consider pinning to a specific version in an environment variable for easier updates.
📝 Committable suggestion