Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7CA2B11371 for ; Wed, 23 Jul 2014 02:20:22 +0000 (UTC) Received: (qmail 40083 invoked by uid 500); 23 Jul 2014 02:20:22 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 40047 invoked by uid 500); 23 Jul 2014 02:20:22 -0000 Mailing-List: contact commits-help@aurora.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.incubator.apache.org Delivered-To: mailing list commits@aurora.incubator.apache.org Received: (qmail 40038 invoked by uid 99); 23 Jul 2014 02:20:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jul 2014 02:20:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 23 Jul 2014 02:20:20 +0000 Received: (qmail 39918 invoked by uid 99); 23 Jul 2014 02:20:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jul 2014 02:20:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 98BCB9B099C; Wed, 23 Jul 2014 02:20:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wfarner@apache.org To: commits@aurora.incubator.apache.org Message-Id: <2e95fd028c4e44e7b60233ebede1005a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Fix constraint violation caused by slave ID change. Date: Wed, 23 Jul 2014 02:20:00 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-aurora Updated Branches: refs/heads/master 813794b0e -> 2b78affb3 Fix constraint violation caused by slave ID change. Bugs closed: AURORA-596 Reviewed at https://reviews.apache.org/r/23832/ Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/2b78affb Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/2b78affb Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/2b78affb Branch: refs/heads/master Commit: 2b78affb3129ffb42ef07217e2362f904ca35177 Parents: 813794b Author: Bill Farner Authored: Tue Jul 22 19:04:42 2014 -0700 Committer: Bill Farner Committed: Tue Jul 22 19:04:42 2014 -0700 ---------------------------------------------------------------------- .../apache/aurora/scheduler/storage/db/DbAttributeStore.java | 2 +- .../apache/aurora/scheduler/storage/db/AttributeMapper.xml | 2 +- .../aurora/scheduler/storage/db/DbAttributeStoreTest.java | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/2b78affb/src/main/java/org/apache/aurora/scheduler/storage/db/DbAttributeStore.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/storage/db/DbAttributeStore.java b/src/main/java/org/apache/aurora/scheduler/storage/db/DbAttributeStore.java index c5bfa1b..34f12a9 100644 --- a/src/main/java/org/apache/aurora/scheduler/storage/db/DbAttributeStore.java +++ b/src/main/java/org/apache/aurora/scheduler/storage/db/DbAttributeStore.java @@ -82,7 +82,7 @@ class DbAttributeStore implements AttributeStore.Mutable { "Host attributes contains empty values: " + hostAttributes); } - mapper.deleteAttributesAndValues(hostAttributes.getSlaveId()); + mapper.deleteAttributesAndValues(hostAttributes.getHost()); mapper.insert(hostAttributes); if (!hostAttributes.getAttributes().isEmpty()) { mapper.insertAttributeValues(hostAttributes); http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/2b78affb/src/main/resources/org/apache/aurora/scheduler/storage/db/AttributeMapper.xml ---------------------------------------------------------------------- diff --git a/src/main/resources/org/apache/aurora/scheduler/storage/db/AttributeMapper.xml b/src/main/resources/org/apache/aurora/scheduler/storage/db/AttributeMapper.xml index f9b689d..deb25bd 100644 --- a/src/main/resources/org/apache/aurora/scheduler/storage/db/AttributeMapper.xml +++ b/src/main/resources/org/apache/aurora/scheduler/storage/db/AttributeMapper.xml @@ -33,7 +33,7 @@ DELETE FROM host_attributes - WHERE slave_id = #{id} + WHERE host = #{id} http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/2b78affb/src/test/java/org/apache/aurora/scheduler/storage/db/DbAttributeStoreTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/db/DbAttributeStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/db/DbAttributeStoreTest.java index 3962fb0..4c82389 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/db/DbAttributeStoreTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/db/DbAttributeStoreTest.java @@ -137,6 +137,14 @@ public class DbAttributeStoreTest { read(HOST_A)); } + @Test + public void testSlaveIdChanges() { + insert(HOST_A_ATTRS); + IHostAttributes updated = IHostAttributes.build(HOST_A_ATTRS.newBuilder().setSlaveId(SLAVE_B)); + insert(updated); + assertEquals(Optional.of(updated), read(HOST_A)); + } + private void insert(final IHostAttributes attributes) { storage.write(new MutateWork.NoResult.Quiet() { @Override