importccl: add 19.2 version gate check #41684
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 |
dt
reviewed
Oct 18, 2019
pkg/ccl/importccl/import_stmt.go
Outdated
| @@ -126,6 +126,10 @@ func importJobDescription( | |||
| func importPlanHook( | |||
| _ context.Context, stmt tree.Statement, p sql.PlanHookState, | |||
| ) (sql.PlanHookRowFn, sqlbase.ResultColumns, []sql.PlanNode, bool, error) { | |||
| if !p.ExecCfg().Settings.Version.IsActive(cluster.VersionPartitionedBackup) { | |||
| return nil, nil, nil, false, errors.Errorf("INSERT requires a cluster fully upgraded to version >= 19.2") | |||
There was a problem hiding this comment.
This whole check needs to be below the importStmt, ok := below or it will just error out every sql statement during an upgrade.
dt
requested changes
Oct 18, 2019
pkg/ccl/importccl/import_stmt.go
Outdated
| @@ -126,6 +126,10 @@ func importJobDescription( | |||
| func importPlanHook( | |||
| _ context.Context, stmt tree.Statement, p sql.PlanHookState, | |||
| ) (sql.PlanHookRowFn, sqlbase.ResultColumns, []sql.PlanNode, bool, error) { | |||
| if !p.ExecCfg().Settings.Version.IsActive(cluster.VersionPartitionedBackup) { | |||
| return nil, nil, nil, false, errors.Errorf("INSERT requires a cluster fully upgraded to version >= 19.2") | |||
There was a problem hiding this comment.
This whole check needs to be below the importStmt, ok := below or it will just error out every sql statement during an upgrade.
Ensure the cluster is fully upgraded when running import. Release note: ensure cluster fully upgraded when running import.
miretskiy
force-pushed
the
version_check
branch
from
d28ab5d to
cc6cae1
Compare
|
Comments addressed. |
dt
approved these changes
Oct 18, 2019
|
bors+ |
|
Let’s backport this in time for the mid-Monday RC as well. |
|
Okay.
…On Fri, Oct 18, 2019, 5:23 PM David Taylor ***@***.***> wrote:
Let’s backport this in time for the mid-Monday RC as well.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#41684?email_source=notifications&email_token=ANA4FVB6QCXUH4T7T23FIPDQPISMLA5CNFSM4JB3UFCKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEBWBJEQ#issuecomment-543954066>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ANA4FVCRJGA6MJBSBRD2PJTQPISMLANCNFSM4JB3UFCA>
.
|
|
bors+ |
|
bors r+ |
craig bot
pushed a commit
that referenced
this pull request
Oct 21, 2019
41684: importccl: add 19.2 version gate check r=miretskiy a=miretskiy Ensure the cluster is fully upgraded when running import. Release note: ensure cluster fully upgraded when running import. 41711: storage/report: don't deserialize zone configs over and over r=andreimatei a=andreimatei This patch is expected to speedup reports generation considerably by not unmarshalling zone config protos for every range. Instead, the report-geneating visitors now keep state around the zone that a visited range is in and reuse that state if they're told that the following range is in the same zone. The range iteration infrastructure was enhanced to figure out when zones change from range to range and tell that to the visitors. Without this patch, generating the reports was pinning a core for minutes for a cluster with partitioning and 200k ranges. The profiles showed that it's all zone config unmarshalling. Fixes #41609 Release note (performance improvement): The performance of generating the system.replication_* reports was greatly improved for large clusters. 41761: storage: write to local storage before updating liveness r=bdarnell a=irfansharif Previously a disk stall could allow a node to continue heartbeating its liveness record and prevent other nodes from taking over its leases, despite being completely unresponsive. This was first addressed in #24591 (+ #33122). This was undone in #32978 (which introduced a stricter version of a similar check). #32978 was later disabled by default in #36484, leaving us without the protections first introduced in #24591. This PR re-adds the logic from #24591. Part of #41683. Release note: None. Co-authored-by: Yevgeniy Miretskiy <[email protected]> Co-authored-by: Andrei Matei <[email protected]> Co-authored-by: irfan sharif <[email protected]>
Build succeeded |
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.
Ensure the cluster is fully upgraded when running import.
Release note: ensure cluster fully upgraded when running import.