Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…db#77235 cockroachdb#77241 cockroachdb#77242

76689: importccl: update parquet vendor r=stevendanna a=msbutler

importccl: update parquet vendor to v0.10.0
    
Release note: None

Release justification: bug fixes and low-risk updates to new functionality

77108: ttl: add telemetry r=rafiss a=otan

This commit adds telemetry to row level TTL configuration, as well as
executions of the row level TTL job.

Release note: None

Release justification: low risk high benefit changes to new
functionality

77232: server: adding tests for statement details status api r=maryliag a=maryliag

This commit adds test cases for the newly created
StatementDetails endpoint.

Release note: None
Release justification: Category 1

77235: ccl/sqlproxyccl: skip TestDirectoryConnect under stress r=JeffSwenson a=jaylim-crl

See cockroachdb#76839.

TestDirectoryConnect seems to be flaking under stress. After some initial
investigations, it is suspected that this may be due to port reuse issues
within the testing environment. We'll skip this test for now, and a TODO
has been added.

Release note: None

Release justification: Low-risk, test only change.

77241: cli: disable automatic compactions for compact command & enable parallelism r=bananabrick a=mufeez-amjad

When running `debug compact`, disable automatic compactions to prevent
excessive retrying of the manual compaction, and to prevent conflicts
in the chosen key ranges to compact in parallel. 

Also, enable concurrent manual compactions in the call to `db.Compact`.

The performance improvements for this change are discussed in:
cockroachdb/pebble#1487

Release note: None

Release justification: Plumbing for pebble change which was merged before
the stability period.

77242: sql: add cluster version gating for new schema changer r=chengxiong-ruan a=chengxiong-ruan

resolves: cockroachdb#77151

Release note: None
Release justification: version gate is needed for the release.

Co-authored-by: Michael Butler <[email protected]>
Co-authored-by: Oliver Tan <[email protected]>
Co-authored-by: Marylia Gutierrez <[email protected]>
Co-authored-by: Jay <[email protected]>
Co-authored-by: Mufeez Amjad <[email protected]>
Co-authored-by: Chengxiong Ruan <[email protected]>
  • Loading branch information
7 people committed Mar 2, 2022
7 parents 83f97bd + b4a2851 + 3f6fe1b + 0883c10 + 2916703 + 836ab71 + 67bae64 commit 1304061
Show file tree
Hide file tree
Showing 32 changed files with 446 additions and 53 deletions.
48 changes: 39 additions & 9 deletions DEPS.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,20 @@ def go_deps():
name = "com_github_apache_thrift",
build_file_proto_mode = "disable_global",
importpath = "github.com/apache/thrift",
sha256 = "f9e5418fda5dff9f5e1a892a127472fc621d417b3ee1351e53141509233fb1d5",
strip_prefix = "github.com/apache/thrift@v0.15.0",
sha256 = "50d5c610df30fa2a6039394d5142382b7d9938870dfb12ef46bddfa3da250893",
strip_prefix = "github.com/apache/thrift@v0.16.0",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/apache/thrift/com_github_apache_thrift-v0.15.0.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/apache/thrift/com_github_apache_thrift-v0.16.0.zip",
],
)
go_repository(
name = "com_github_araddon_dateparse",
build_file_proto_mode = "disable_global",
importpath = "github.com/araddon/dateparse",
sha256 = "8fe74d5b36a9aa66c1350657009296469f8aa5b6925acd178044cd248023fc5a",
strip_prefix = "github.com/araddon/[email protected]",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/araddon/dateparse/com_github_araddon_dateparse-v0.0.0-20210429162001-6b43995a97de.zip",
],
)
go_repository(
Expand Down Expand Up @@ -2448,10 +2458,10 @@ def go_deps():
name = "com_github_fraugster_parquet_go",
build_file_proto_mode = "disable_global",
importpath = "github.com/fraugster/parquet-go",
sha256 = "66beb8f2218c31ca4ca3d3dbcc91c256f3379750ade924016f4179982446edd7",
strip_prefix = "github.com/fraugster/parquet-go@v0.6.1",
sha256 = "a9d995d60a99dac8709c614f3d2795ef4d8d79c82991b40fa703006078babf75",
strip_prefix = "github.com/fraugster/parquet-go@v0.10.0",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/fraugster/parquet-go/com_github_fraugster_parquet_go-v0.6.1.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/fraugster/parquet-go/com_github_fraugster_parquet_go-v0.10.0.zip",
],
)
go_repository(
Expand Down Expand Up @@ -5319,10 +5329,10 @@ def go_deps():
name = "com_github_mattn_go_runewidth",
build_file_proto_mode = "disable_global",
importpath = "github.com/mattn/go-runewidth",
sha256 = "dab6e7984b913f61d02ac53f5c1875c029e591f3b4d3262dea8e95d8c28bb657",
strip_prefix = "github.com/mattn/[email protected].7",
sha256 = "030dcf3ea6cb39b34269f119ee5fe5e9d5834daf409e1f3f48c065a45326f4a6",
strip_prefix = "github.com/mattn/[email protected].10",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mattn/go-runewidth/com_github_mattn_go_runewidth-v0.0.7.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mattn/go-runewidth/com_github_mattn_go_runewidth-v0.0.10.zip",
],
)
go_repository(
Expand Down Expand Up @@ -6733,6 +6743,16 @@ def go_deps():
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/retailnext/hllpp/com_github_retailnext_hllpp-v1.0.1-0.20180308014038-101a6d2f8b52.zip",
],
)
go_repository(
name = "com_github_rivo_uniseg",
build_file_proto_mode = "disable_global",
importpath = "github.com/rivo/uniseg",
sha256 = "cb701df81f36acfbb2627a78662fdcaa150ee1ac00d0796a7f3eafbdb6218128",
strip_prefix = "github.com/rivo/[email protected]",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/rivo/uniseg/com_github_rivo_uniseg-v0.1.0.zip",
],
)
go_repository(
name = "com_github_robertkrimen_godocdown",
build_file_proto_mode = "disable_global",
Expand Down Expand Up @@ -6923,6 +6943,16 @@ def go_deps():
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/sclevine/agouti/com_github_sclevine_agouti-v3.0.0+incompatible.zip",
],
)
go_repository(
name = "com_github_scylladb_termtables",
build_file_proto_mode = "disable_global",
importpath = "github.com/scylladb/termtables",
sha256 = "0afd3a75417e6b708c62329cea7f2822162c8bf6ada0de094cdc032461b8f196",
strip_prefix = "github.com/scylladb/[email protected]",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/scylladb/termtables/com_github_scylladb_termtables-v0.0.0-20191203121021-c4c0b6d42ff4.zip",
],
)
go_repository(
name = "com_github_sean__seed",
build_file_proto_mode = "disable_global",
Expand Down
2 changes: 1 addition & 1 deletion docs/generated/settings/settings-for-tenants.txt
Original file line number Diff line number Diff line change
Expand Up @@ -185,4 +185,4 @@ trace.debug.enable boolean false if set, traces for recent requests can be seen
trace.jaeger.agent string the address of a Jaeger agent to receive traces using the Jaeger UDP Thrift protocol, as <host>:<port>. If no port is specified, 6381 will be used.
trace.opentelemetry.collector string address of an OpenTelemetry trace collector to receive traces using the otel gRPC protocol, as <host>:<port>. If no port is specified, 4317 will be used.
trace.zipkin.collector string the address of a Zipkin instance to receive traces, as <host>:<port>. If no port is specified, 9411 will be used.
version version 21.2-84 set the active cluster version in the format '<major>.<minor>'
version version 21.2-86 set the active cluster version in the format '<major>.<minor>'
2 changes: 1 addition & 1 deletion docs/generated/settings/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,6 @@
<tr><td><code>trace.jaeger.agent</code></td><td>string</td><td><code></code></td><td>the address of a Jaeger agent to receive traces using the Jaeger UDP Thrift protocol, as <host>:<port>. If no port is specified, 6381 will be used.</td></tr>
<tr><td><code>trace.opentelemetry.collector</code></td><td>string</td><td><code></code></td><td>address of an OpenTelemetry trace collector to receive traces using the otel gRPC protocol, as <host>:<port>. If no port is specified, 4317 will be used.</td></tr>
<tr><td><code>trace.zipkin.collector</code></td><td>string</td><td><code></code></td><td>the address of a Zipkin instance to receive traces, as <host>:<port>. If no port is specified, 9411 will be used.</td></tr>
<tr><td><code>version</code></td><td>version</td><td><code>21.2-84</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
<tr><td><code>version</code></td><td>version</td><td><code>21.2-86</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
</tbody>
</table>
7 changes: 4 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ require (
github.com/elastic/gosigar v0.14.1
github.com/emicklei/dot v0.15.0
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a
github.com/fraugster/parquet-go v0.6.1
github.com/fraugster/parquet-go v0.10.0
github.com/fsnotify/fsnotify v1.5.1
github.com/getsentry/sentry-go v0.12.0
github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9
Expand Down Expand Up @@ -188,7 +188,7 @@ require (
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/abbot/go-http-auth v0.4.1-0.20181019201920-860ed7f246ff // indirect
github.com/alexbrainman/sspi v0.0.0-20180613141037-e580b900e9f5 // indirect
github.com/apache/thrift v0.15.0 // indirect
github.com/apache/thrift v0.16.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.4.2 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.5.1 // indirect
Expand Down Expand Up @@ -268,7 +268,7 @@ require (
github.com/magiconair/properties v1.8.5 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-ieproxy v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.7 // indirect
github.com/mattn/go-runewidth v0.0.10 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/minio-go/v7 v7.0.21 // indirect
Expand All @@ -293,6 +293,7 @@ require (
github.com/pquerna/cachecontrol v0.0.0-20200921180117-858c6e7e6b7e // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/pseudomuto/protokit v0.2.0 // indirect
github.com/rivo/uniseg v0.1.0 // indirect
github.com/rogpeppe/go-internal v1.8.1 // indirect
github.com/rs/xid v1.3.0 // indirect
github.com/russross/blackfriday v1.6.0 // indirect
Expand Down
14 changes: 10 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,10 @@ github.com/apache/arrow/go/arrow v0.0.0-20200923215132-ac86123a3f01/go.mod h1:QN
github.com/apache/thrift v0.0.0-20151001171628-53dd39833a08/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.15.0 h1:aGvdaR0v1t9XLgjtBYwxcBvBOTMqClzwE26CHOgjW1Y=
github.com/apache/thrift v0.15.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
github.com/apache/thrift v0.16.0 h1:qEy6UW60iVOlUy+b9ZR0d5WzUWYGOo4HfopoyBaNmoY=
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
Expand Down Expand Up @@ -712,8 +714,8 @@ github.com/frankban/quicktest v1.7.3/go.mod h1:V1d2J5pfxYH6EjBAgSK7YNXcXlTWxUHdE
github.com/frankban/quicktest v1.10.1/go.mod h1:z7wHrVXJKCWP1Ev7B3iy2DivmuL5uGeeJDWYz/6LLhY=
github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY=
github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
github.com/fraugster/parquet-go v0.6.1 h1:Kks9Ibly3ZZQPRPGkS1lVmrwndBp8PxamBnDFG5jvEM=
github.com/fraugster/parquet-go v0.6.1/go.mod h1:1HGhXzpHv7CULzknVNWIY0Ihn2O3qNbD1p+aQvHWhqo=
github.com/fraugster/parquet-go v0.10.0 h1:whX91AO3dkkOnbH9MqD53DZ3rISw+Tnnj5yiqXjSv9Q=
github.com/fraugster/parquet-go v0.10.0/go.mod h1:asQOKX0K/j+F3Xyj87kw7gKrU3yXo9M2hb8STSQKIIw=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
Expand Down Expand Up @@ -1537,8 +1539,9 @@ github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
github.com/mattn/go-runewidth v0.0.10 h1:CoZ3S2P7pvtP45xOtBw+/mDL2z0RKI576gSkzRRpdGg=
github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
Expand Down Expand Up @@ -1873,6 +1876,8 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc=
github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/robertkrimen/godocdown v0.0.0-20130622164427-0bfa04905481/go.mod h1:C9WhFzY47SzYBIvzFqSvHIR6ROgDo4TtdTuRaOMjF/s=
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
Expand Down Expand Up @@ -1913,6 +1918,7 @@ github.com/savsgio/gotils v0.0.0-20210921075833-21a6215cb0e4/go.mod h1:oejLrk1Y/
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210223165440-c65ae3540d44/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
github.com/sectioneight/md-to-godoc v0.0.0-20161108233149-55e43be6c335/go.mod h1:lPZq22klO8la1kyImIDhrGytugMV0TsrsZB55a+xxI0=
Expand Down
2 changes: 1 addition & 1 deletion pkg/ccl/cliccl/debug.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ func runEncryptionStatus(cmd *cobra.Command, args []string) error {

dir := args[0]

db, err := cli.OpenExistingStore(dir, stopper, true /* readOnly */)
db, err := cli.OpenExistingStore(dir, stopper, true /* readOnly */, false /* disableAutomaticCompactions */)
if err != nil {
return err
}
Expand Down
3 changes: 3 additions & 0 deletions pkg/ccl/sqlproxyccl/proxy_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,9 @@ func TestDenylistUpdate(t *testing.T) {

func TestDirectoryConnect(t *testing.T) {
defer leaktest.AfterTest(t)()
// TODO(jaylim-crl): This is a potential port reuse issue, so skip this
// under stress. See linked GitHub issue.
skip.UnderStress(t, "https://github.com/cockroachdb/cockroach/issues/76839")
skip.UnderDeadlockWithIssue(t, 71365)
defer log.Scope(t).Close(t)

Expand Down
38 changes: 24 additions & 14 deletions pkg/cli/debug.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,9 @@ func parsePositiveDuration(arg string) (time.Duration, error) {

// OpenEngineOptions tunes the behavior of OpenEngine.
type OpenEngineOptions struct {
ReadOnly bool
MustExist bool
ReadOnly bool
MustExist bool
DisableAutomaticCompactions bool
}

func (opts OpenEngineOptions) configOptions() []storage.ConfigOption {
Expand All @@ -143,13 +144,22 @@ func (opts OpenEngineOptions) configOptions() []storage.ConfigOption {
if opts.MustExist {
cfgOpts = append(cfgOpts, storage.MustExist)
}
if opts.DisableAutomaticCompactions {
cfgOpts = append(cfgOpts, storage.DisableAutomaticCompactions)
}
return cfgOpts
}

// OpenExistingStore opens the Pebble engine rooted at 'dir'.
// If 'readOnly' is true, opens the store in read-only mode.
func OpenExistingStore(dir string, stopper *stop.Stopper, readOnly bool) (storage.Engine, error) {
return OpenEngine(dir, stopper, OpenEngineOptions{ReadOnly: readOnly, MustExist: true})
// OpenExistingStore opens the Pebble engine rooted at 'dir'. If 'readOnly' is
// true, opens the store in read-only mode. If 'disableAutomaticCompactions' is
// true, disables automatic/background compactions (only used for manual
// compactions).
func OpenExistingStore(
dir string, stopper *stop.Stopper, readOnly, disableAutomaticCompactions bool,
) (storage.Engine, error) {
return OpenEngine(dir, stopper, OpenEngineOptions{
ReadOnly: readOnly, MustExist: true, DisableAutomaticCompactions: disableAutomaticCompactions,
})
}

// OpenEngine opens the engine at 'dir'. Depending on the supplied options,
Expand Down Expand Up @@ -237,7 +247,7 @@ func runDebugKeys(cmd *cobra.Command, args []string) error {
stopper := stop.NewStopper()
defer stopper.Stop(context.Background())

db, err := OpenExistingStore(args[0], stopper, true /* readOnly */)
db, err := OpenExistingStore(args[0], stopper, true /* readOnly */, false /* disableAutomaticCompactions */)
if err != nil {
return err
}
Expand Down Expand Up @@ -410,7 +420,7 @@ func runDebugRangeData(cmd *cobra.Command, args []string) error {
stopper := stop.NewStopper()
defer stopper.Stop(context.Background())

db, err := OpenExistingStore(args[0], stopper, true /* readOnly */)
db, err := OpenExistingStore(args[0], stopper, true /* readOnly */, false /* disableAutomaticCompactions */)
if err != nil {
return err
}
Expand Down Expand Up @@ -500,7 +510,7 @@ func runDebugRangeDescriptors(cmd *cobra.Command, args []string) error {
stopper := stop.NewStopper()
defer stopper.Stop(context.Background())

db, err := OpenExistingStore(args[0], stopper, true /* readOnly */)
db, err := OpenExistingStore(args[0], stopper, true /* readOnly */, false /* disableAutomaticCompactions */)
if err != nil {
return err
}
Expand Down Expand Up @@ -628,7 +638,7 @@ func runDebugRaftLog(cmd *cobra.Command, args []string) error {
stopper := stop.NewStopper()
defer stopper.Stop(context.Background())

db, err := OpenExistingStore(args[0], stopper, true /* readOnly */)
db, err := OpenExistingStore(args[0], stopper, true /* readOnly */, false /* disableAutomaticCompactions */)
if err != nil {
return err
}
Expand Down Expand Up @@ -698,7 +708,7 @@ func runDebugGCCmd(cmd *cobra.Command, args []string) error {
}
}

db, err := OpenExistingStore(args[0], stopper, true /* readOnly */)
db, err := OpenExistingStore(args[0], stopper, true /* readOnly */, false /* disableAutomaticCompactions */)
if err != nil {
return err
}
Expand Down Expand Up @@ -796,7 +806,7 @@ func runDebugCompact(cmd *cobra.Command, args []string) error {
stopper := stop.NewStopper()
defer stopper.Stop(context.Background())

db, err := OpenExistingStore(args[0], stopper, false /* readOnly */)
db, err := OpenExistingStore(args[0], stopper, false /* readOnly */, true /* disableAutomaticCompactions */)
if err != nil {
return err
}
Expand Down Expand Up @@ -1064,7 +1074,7 @@ func runDebugUnsafeRemoveDeadReplicas(cmd *cobra.Command, args []string) error {
stopper := stop.NewStopper()
defer stopper.Stop(context.Background())

db, err := OpenExistingStore(args[0], stopper, false /* readOnly */)
db, err := OpenExistingStore(args[0], stopper, false /* readOnly */, false /* disableAutomaticCompactions */)
if err != nil {
return err
}
Expand Down Expand Up @@ -1426,7 +1436,7 @@ func runDebugIntentCount(cmd *cobra.Command, args []string) error {
ctx := context.Background()
defer stopper.Stop(ctx)

db, err := OpenExistingStore(args[0], stopper, true /* readOnly */)
db, err := OpenExistingStore(args[0], stopper, true /* readOnly */, false /* disableAutomaticCompactions */)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/debug_check_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func checkStoreRangeStats(
stopper := stop.NewStopper()
defer stopper.Stop(ctx)

eng, err := OpenExistingStore(dir, stopper, true /* readOnly */)
eng, err := OpenExistingStore(dir, stopper, true /* readOnly */, false /* disableAutomaticCompactions */)
if err != nil {
return err
}
Expand Down Expand Up @@ -220,7 +220,7 @@ func checkStoreRaftState(
stopper := stop.NewStopper()
defer stopper.Stop(context.Background())

db, err := OpenExistingStore(dir, stopper, true /* readOnly */)
db, err := OpenExistingStore(dir, stopper, true /* readOnly */, false /* disableAutomaticCompactions */)
if err != nil {
return err
}
Expand Down
Loading

0 comments on commit 1304061

Please sign in to comment.