summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-03-27 12:23:04 +0100
committerGitHub <noreply@github.com>2021-03-27 12:23:04 +0100
commit6a72035aa8ccfd49e665ea8d34c1d4605153b1a0 (patch)
treee61d6647f78564e2fcd500e6308d815a9e86ad0b
parentb7b6696e67907fffcffeb0b9eb6cd79d13e5a4d1 (diff)
parent24e5b3dd392fec43ccbb28ea92fd7bc68901d11e (diff)
Merge pull request #17215 from vespa-engine/hmusum/use-unique-temp-file
Use unique temp file, config may be created by more than service at a…
-rw-r--r--zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java b/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java
index 4f96bba22b0..8236fdedc71 100644
--- a/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java
+++ b/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java
@@ -46,7 +46,7 @@ public class ZkClientConfigBuilder {
public ZKClientConfig toConfig(Path configFile) throws IOException, QuorumPeerConfig.ConfigException {
String configString = toConfigString();
Files.createDirectories(configFile.getParent());
- Path tempFile = configFile.resolveSibling("." + configFile.getFileName() + ".tmp");
+ Path tempFile = Files.createTempFile(configFile.toAbsolutePath().getParent(), "." + configFile.getFileName(), ".tmp");
Files.writeString(tempFile, configString);
Files.move(tempFile, configFile, StandardCopyOption.ATOMIC_MOVE);
return new ZKClientConfig(configFile.toString());