diff options
author | Martin Polden <mpolden@mpolden.no> | 2017-12-11 14:29:49 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2017-12-11 14:30:03 +0100 |
commit | 2951c576078b765dcb5de4611d520055dd592be5 (patch) | |
tree | a58be1e5c1b6d0ef027fadd2bd97018b9c3a63b7 /controller-server | |
parent | c64cebe292f68fc37864827a54751123aec0a5e9 (diff) |
Revert "Log DNS update"
This reverts commit adae0a8419978d3bc9f0a752d89fd8abc95718e1.
Diffstat (limited to 'controller-server')
2 files changed, 2 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index 43133cc0d70..ffd26c36317 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -459,8 +459,7 @@ public class ApplicationController { if (record.isPresent()) { // Ensure that the existing record points to the correct rotation if (!record.get().data().equals(rotationName)) { - // TODO: Enable once verified - //nameService.updateRecord(record.get().id(), rotationName); + nameService.updateRecord(record.get().id(), rotationName); log.info("Updated mapping for record ID " + record.get().id().asString() + ": '" + dnsName + "' -> '" + rotation.name() + "'"); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index 3363981d6c0..02974765be8 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -22,7 +22,6 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.PropertyId; import com.yahoo.vespa.hosted.controller.api.identifiers.TenantId; import com.yahoo.vespa.hosted.controller.api.identifiers.UserGroup; import com.yahoo.vespa.hosted.controller.api.integration.BuildService.BuildJob; -import com.yahoo.vespa.hosted.controller.api.integration.athenz.NToken; import com.yahoo.vespa.hosted.controller.api.integration.dns.Record; import com.yahoo.vespa.hosted.controller.api.integration.dns.RecordName; import com.yahoo.vespa.hosted.controller.application.ApplicationPackage; @@ -32,6 +31,7 @@ import com.yahoo.vespa.hosted.controller.application.DeploymentJobs; import com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobError; import com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType; import com.yahoo.vespa.hosted.controller.application.JobStatus; +import com.yahoo.vespa.hosted.controller.api.integration.athenz.NToken; import com.yahoo.vespa.hosted.controller.athenz.mock.AthenzDbMock; import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder; import com.yahoo.vespa.hosted.controller.deployment.BuildSystem; @@ -42,7 +42,6 @@ import com.yahoo.vespa.hosted.controller.rotation.RotationLock; import com.yahoo.vespa.hosted.controller.versions.DeploymentStatistics; import com.yahoo.vespa.hosted.controller.versions.VersionStatus; import com.yahoo.vespa.hosted.controller.versions.VespaVersion; -import org.junit.Ignore; import org.junit.Test; import java.io.IOException; @@ -619,7 +618,6 @@ public class ControllerTest { } @Test - @Ignore // TODO: Re-enable once verified public void testUpdatesExistingDnsAlias() { DeploymentTester tester = new DeploymentTester(); |