diff options
author | Martin Polden <mpolden@mpolden.no> | 2017-12-11 09:50:07 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2017-12-11 09:50:07 +0100 |
commit | adae0a8419978d3bc9f0a752d89fd8abc95718e1 (patch) | |
tree | db851c755095ee521e143fbe42ac6021555549b9 /controller-server | |
parent | 829dc23c309ec1fb2f5e6ac18aa341cd5051bfe7 (diff) |
Log DNS update
Diffstat (limited to 'controller-server')
2 files changed, 5 insertions, 4 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 15a0f04b54a..43133cc0d70 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,9 +459,8 @@ public class ApplicationController { if (record.isPresent()) { // Ensure that the existing record points to the correct rotation if (!record.get().data().equals(rotationName)) { - nameService.updateRecord(record.get().id(), rotationName); - log.info("Updated mapping for record ID " + record.get().id().asString() + ": " + dnsName - + " -> " + rotation.name()); + // TODO: Enable once verified + //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 02974765be8..3363981d6c0 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,6 +22,7 @@ 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; @@ -31,7 +32,6 @@ 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,6 +42,7 @@ 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; @@ -618,6 +619,7 @@ public class ControllerTest { } @Test + @Ignore // TODO: Re-enable once verified public void testUpdatesExistingDnsAlias() { DeploymentTester tester = new DeploymentTester(); |