summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorMartin Polden <martin.polden@gmail.com>2017-05-16 08:59:03 +0200
committerMartin Polden <martin.polden@gmail.com>2017-05-16 08:59:03 +0200
commit2911572a77a1dc04bb5c53bce78c24e17db4747d (patch)
tree39a23f3106d069f104905528db616b638cd623d3 /node-admin
parentae77ebac3343e2fda414eef59145b15c0397062f (diff)
Synchronize ACL configuration
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java
index 385e823dc3a..00e0568100d 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java
@@ -33,8 +33,8 @@ import java.util.stream.Collectors;
* @author mpolden
*/
public class AclMaintainer implements Runnable {
- private static final PrefixLogger log = PrefixLogger.getNodeAdminLogger(AclMaintainer.class);
+ private static final PrefixLogger log = PrefixLogger.getNodeAdminLogger(AclMaintainer.class);
private static final String IPTABLES_COMMAND = "ip6tables";
private final DockerOperations dockerOperations;
@@ -77,7 +77,7 @@ public class AclMaintainer implements Runnable {
}
}
- private void configureAcls() {
+ private synchronized void configureAcls() {
final Map<ContainerName, List<ContainerAclSpec>> aclSpecsGroupedByHostname = nodeRepository
.getContainerAclSpecs(nodeAdminHostname).stream()
.collect(Collectors.groupingBy(ContainerAclSpec::trustedBy));