luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Clean up temporary files on write errors, and ignore any temporary service files on load with a warning. This fixes #3207

This commit is contained in:
Preetha Appan 2017-07-24 12:37:14 -05:00
parent 623d4203c7
commit c08ff6c8ae
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@ FEATURES:
IMPROVEMENTS: IMPROVEMENTS:
BUG FIXES: BUG FIXES:
* agent: Clean up temporary files during disk write errors when persisting services and checks. [GH-3207]
## 0.9.0 (July 20, 2017) ## 0.9.0 (July 20, 2017)

28
agent/agent.go
View File

@ -1428,7 +1428,7 @@ func (a *Agent) persistService(service *structs.NodeService) error {
return err return err
} }
return writeFileAtomic(svcPath, encoded) return writeFileAtomic(svcPath, encoded, a.logger)
} }
// purgeService removes a persisted service definition file from the data dir // purgeService removes a persisted service definition file from the data dir
@ -1456,7 +1456,7 @@ func (a *Agent) persistCheck(check *structs.HealthCheck, chkType *structs.CheckT
return err return err
} }
return writeFileAtomic(checkPath, encoded) return writeFileAtomic(checkPath, encoded, a.logger)
} }
// purgeCheck removes a persisted check definition file from the data dir // purgeCheck removes a persisted check definition file from the data dir
@ -1470,7 +1470,7 @@ func (a *Agent) purgeCheck(checkID types.CheckID) error {
// writeFileAtomic writes the given contents to a temporary file in the same // writeFileAtomic writes the given contents to a temporary file in the same
// directory, does an fsync and then renames the file to its real path // directory, does an fsync and then renames the file to its real path
func writeFileAtomic(path string, contents []byte) error { func writeFileAtomic(path string, contents []byte, logger *log.Logger) error {
uuid, err := uuid.GenerateUUID() uuid, err := uuid.GenerateUUID()
if err != nil { if err != nil {
return err return err
@ -1485,15 +1485,30 @@ func writeFileAtomic(path string, contents []byte) error {
return err return err
} }
if _, err := fh.Write(contents); err != nil { if _, err := fh.Write(contents); err != nil {
logger.Printf("[INFO] Writing to temp file at %v failed, deleting...\n", tempPath)
fh.Close()
os.Remove(tempPath)
return err return err
} }
if err := fh.Sync(); err != nil { if err := fh.Sync(); err != nil {
logger.Printf("[INFO] Syncing temp file at %v failed, deleting...\n", tempPath)
fh.Close()
os.Remove(tempPath)
return err return err
} }
if err := fh.Close(); err != nil { if err := fh.Close(); err != nil {
logger.Printf("[INFO] Closing file handle to temp file at %v failed, deleting...\n", tempPath)
fh.Close()
os.Remove(tempPath)
return err return err
} }
return os.Rename(tempPath, path) if err := os.Rename(tempPath, path); err != nil {
logger.Printf("[INFO] Renaming temp file at %v failed, deleting...\n", tempPath)
fh.Close()
os.Remove(tempPath)
return err
}
return nil
} }
// AddService is used to add a service entry. // AddService is used to add a service entry.
@ -2072,6 +2087,11 @@ func (a *Agent) loadServices(conf *Config) error {
continue continue
} }
// Skip all partially written temporary files
if strings.HasSuffix(fi.Name(), "tmp") {
a.logger.Printf("[WARN] Ignoring temporary service file %v", fi.Name())
continue
}
// Open the file for reading // Open the file for reading
file := filepath.Join(svcDir, fi.Name()) file := filepath.Join(svcDir, fi.Name())
fh, err := os.Open(file) fh, err := os.Open(file)