mirror of https://github.com/status-im/consul.git
Use safeio to write server metadata file (#20101)
* Use safeio to write server metadata file * guard the conversion
This commit is contained in:
parent
d2f6a25c28
commit
15b40f36f3
|
@ -31,6 +31,7 @@ import (
|
||||||
"github.com/hashicorp/hcp-scada-provider/capability"
|
"github.com/hashicorp/hcp-scada-provider/capability"
|
||||||
"github.com/hashicorp/raft"
|
"github.com/hashicorp/raft"
|
||||||
"github.com/hashicorp/serf/serf"
|
"github.com/hashicorp/serf/serf"
|
||||||
|
"github.com/rboyer/safeio"
|
||||||
"golang.org/x/net/http2"
|
"golang.org/x/net/http2"
|
||||||
"golang.org/x/net/http2/h2c"
|
"golang.org/x/net/http2/h2c"
|
||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
|
@ -4668,6 +4669,14 @@ func (a *Agent) persistServerMetadata() {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Use safeio.File to ensure the file is written to disk atomically
|
||||||
|
if sf, ok := f.(*safeio.File); ok {
|
||||||
|
if err := sf.Commit(); err != nil {
|
||||||
|
sf.Close()
|
||||||
|
a.logger.Error("failed to commit server metadata", "error", err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
f.Close()
|
f.Close()
|
||||||
case <-a.shutdownCh:
|
case <-a.shutdownCh:
|
||||||
return
|
return
|
||||||
|
|
|
@ -8,6 +8,8 @@ import (
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/rboyer/safeio"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ServerMetadataFile is the name of the file on disk that server metadata
|
// ServerMetadataFile is the name of the file on disk that server metadata
|
||||||
|
@ -31,7 +33,7 @@ func (md *ServerMetadata) IsLastSeenStale(d time.Duration) bool {
|
||||||
// OpenServerMetadata is a helper function for opening the server metadata file
|
// OpenServerMetadata is a helper function for opening the server metadata file
|
||||||
// with the correct permissions.
|
// with the correct permissions.
|
||||||
func OpenServerMetadata(filename string) (io.WriteCloser, error) {
|
func OpenServerMetadata(filename string) (io.WriteCloser, error) {
|
||||||
return os.OpenFile(filename, os.O_WRONLY|os.O_CREATE, 0600)
|
return safeio.OpenFile(filename, 0600)
|
||||||
}
|
}
|
||||||
|
|
||||||
type ServerMetadataReadFunc func(filename string) (*ServerMetadata, error)
|
type ServerMetadataReadFunc func(filename string) (*ServerMetadata, error)
|
||||||
|
|
Loading…
Reference in New Issue