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

Make Codespell happy (backport #181) #184

Closed
wants to merge 1 commit into from
Closed

Make Codespell happy (backport #181) #184

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
10 changes: 10 additions & 0 deletions pkg/datasource/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,16 @@ func (s *Service) exportFromVolume(parameters map[string]string) error {
parameters[types.DataSourceTypeExportFromVolumeParameterVolumeSize], err)
}

<<<<<<< HEAD
=======
var timeout int
if timeout, err = strconv.Atoi(parameters[types.DataSourceTypeExportFromVolumeParameterFileSyncHTTPClientTimeout]); err != nil {
s.log.Warnf("DataSource Service: Failed to parse string %v to a valid timeout integer, will ignore this input parameter: %v",
parameters[types.DataSourceTypeExportFromVolumeParameterFileSyncHTTPClientTimeout], err)
timeout = 60
}

>>>>>>> c140ba9 (Make Codespell happy)
// TODO: Use the storage IP of the sync service after launching the separate sync server pod.
storageIP, err := util.GetIPForPod()
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/manager/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ func (m *Manager) Fetch(ctx context.Context, req *rpc.FetchRequest) (resp *rpc.B

var srcFilePath string
if req.DataSourceAddress != "" {
log.Infof("Backing Image Manager: need to transfer the file from the data sourece server first")
log.Infof("Backing Image Manager: need to transfer the file from the data source server first")
srcFilePath = types.GetDataSourceFilePath(m.diskPath, req.Spec.Name, req.Spec.Uuid)
dsClient := &client.DataSourceClient{Remote: req.DataSourceAddress}
dsInfo, err := dsClient.Get()
Expand All @@ -464,7 +464,7 @@ func (m *Manager) Fetch(ctx context.Context, req *rpc.FetchRequest) (resp *rpc.B
return nil, err
}
} else {
log.Infof("Backing Image Manager: there is no need to transfer the file from the data sourece server, will try to directly reuse the file")
log.Infof("Backing Image Manager: there is no need to transfer the file from the data source server, will try to directly reuse the file")
srcFilePath = types.GetBackingImageFilePath(m.diskPath, req.Spec.Name, req.Spec.Uuid)
}

Expand Down