zone: Fix zone configuration application bug #41089
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This change is |
rohany
force-pushed
the
zone-application-bug
branch
from
0c5e38f
to
7df9d0a
Compare
andreimatei
reviewed
Sep 26, 2019
There was a problem hiding this comment.
LGTM
Reviewable status:
complete! 0 of 0 LGTMs obtained (waiting on @andreimatei, @knz, and @rohany)
pkg/ccl/logictestccl/testdata/logic_test/zone, line 766 at r1 (raw file):
ALTER TABLE system.jobs CONFIGURE ZONE USING num_replicas = 3 # Test that index configurations don't infect partition configurations.
pls add more words here. Say something checking that num_replicas is not copied to p1's partition
There was a bug that allowed zone configuration application on indexes to leak into the zone configurations for partitions, due to a subtlety in ZoneConfig.GetSubzone. This PR fixes the bug with zone configuration application and adds a test. This PR is necessary for cockroachdb#40493 to land. An example of this is as follows: ``` CREATE TABLE infect (x INT PRIMARY KEY); ALTER TABLE infect PARTITION BY LIST (x) ( PARTITION p1 VALUES IN (1)); ALTER INDEX infect@primary CONFIGURE ZONE USING num_replicas=5; ALTER PARTITION p1 OF TABLE infect CONFIGURE ZONE USING constraints='[+dc=dc1]'; ``` Before, the zone configuration for p1 would *also have* num_replicas=5 set, which should not be the case. This PR ensures that the zone configuration for p1 only has constraints set. Release Justification: Important bug fix. Release note (bug fix): Fixing bug where zone configuration application on indexes could leak into configurations on partitions.
rohany
force-pushed
the
zone-application-bug
branch
from
7df9d0a
to
c5aba04
Compare
|
TFTR -- updated. |
|
bors r=andreimatei |
craig bot
pushed a commit
that referenced
this pull request
Sep 26, 2019
41089: zone: Fix zone configuration application bug r=andreimatei a=rohany There was a bug that allowed zone configuration application on indexes to leak into the zone configurations for partitions, due to a subtlety in ZoneConfig.GetSubzone. This PR fixes the bug with zone configuration application and adds a test. This PR is necessary for #40493 to land. An example of this is as follows: ``` CREATE TABLE infect (x INT PRIMARY KEY); ALTER TABLE infect PARTITION BY LIST (x) ( PARTITION p1 VALUES IN (1)); ALTER INDEX infect@primary CONFIGURE ZONE USING num_replicas=5; ALTER PARTITION p1 OF TABLE infect CONFIGURE ZONE USING constraints='[+dc=dc1]'; ``` Before, the zone configuration for p1 would *also have* num_replicas=5 set, which should not be the case. This PR ensures that the zone configuration for p1 only has constraints set. Release Justification: Important bug fix. Release note (bug fix): Fixing bug where zone configuration application on indexes could leak into configurations on partitions. 41130: roachtest: update hibernate blacklist after new syntax support r=jordanlewis a=rafiss Some tests that used to fail pass now since we support SELECT FOR UPDATE syntax. relates to #40538 Release justification: test only change Release note: None Co-authored-by: Rohan Yadav <rohany@cockroachlabs.com> Co-authored-by: Rafi Shamim <rafi@cockroachlabs.com>
Build succeeded |
This was referenced Oct 17, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a bug that allowed zone configuration application on indexes
to leak into the zone configurations for partitions, due to a subtlety in
ZoneConfig.GetSubzone. This PR fixes the bug with zone configuration
application and adds a test.
This PR is necessary for #40493 to land.
An example of this is as follows:
Before, the zone configuration for p1 would also have num_replicas=5
set, which should not be the case. This PR ensures that the zone
configuration for p1 only has constraints set.
Release Justification: Important bug fix.
Release note (bug fix): Fixing bug where zone configuration application
on indexes could leak into configurations on partitions.