Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2efbf19c62 |
+2
-2
@@ -147,8 +147,8 @@ func (j *controlJob) Run(ctx context.Context) {
|
|||||||
server := http.Server{
|
server := http.Server{
|
||||||
Handler: mux,
|
Handler: mux,
|
||||||
// control socket is local, 1s timeout should be more than sufficient, even on a loaded system
|
// control socket is local, 1s timeout should be more than sufficient, even on a loaded system
|
||||||
WriteTimeout: envconst.Duration("ZREPL_DAEMON_CONTROL_WRITE_TIMEOUT", 1*time.Second),
|
WriteTimeout: 1 * time.Second,
|
||||||
ReadTimeout: envconst.Duration("ZREPL_DAEMON_CONTROL_READ_TIMEOUT", 1*time.Second),
|
ReadTimeout: 1 * time.Second,
|
||||||
}
|
}
|
||||||
|
|
||||||
outer:
|
outer:
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ type FilesystemPlaceholderState struct {
|
|||||||
// For nonexistent FS, err == nil and state.FSExists == false
|
// For nonexistent FS, err == nil and state.FSExists == false
|
||||||
func ZFSGetFilesystemPlaceholderState(p *DatasetPath) (state *FilesystemPlaceholderState, err error) {
|
func ZFSGetFilesystemPlaceholderState(p *DatasetPath) (state *FilesystemPlaceholderState, err error) {
|
||||||
state = &FilesystemPlaceholderState{FS: p.ToString()}
|
state = &FilesystemPlaceholderState{FS: p.ToString()}
|
||||||
state.FS = p.ToString()
|
|
||||||
props, err := zfsGet(p.ToString(), []string{PlaceholderPropertyName}, sourceLocal)
|
props, err := zfsGet(p.ToString(), []string{PlaceholderPropertyName}, sourceLocal)
|
||||||
var _ error = (*DatasetDoesNotExist)(nil) // weak assertion on zfsGet's interface
|
var _ error = (*DatasetDoesNotExist)(nil) // weak assertion on zfsGet's interface
|
||||||
if _, ok := err.(*DatasetDoesNotExist); ok {
|
if _, ok := err.(*DatasetDoesNotExist); ok {
|
||||||
|
|||||||
Reference in New Issue
Block a user