Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cluster-ui: update peer dependencies #67722

Merged
merged 1 commit into from
Jul 22, 2021

Conversation

celiala
Copy link
Collaborator

@celiala celiala commented Jul 16, 2021

Previously, running yarn for CC console service would output
peer dependency warnings for cluster-ui dependency.

This change updates peer dependencies to remove warnings.

Note: this will also be backported to 21.1 and 20.2, for
respective cluster-ui-21-1 and cluster-ui-20-2 packages.

Release note: None

Before: (run from <path-of-cockroach-cloud-repo>/console)

After:

Previously, running yarn for CC console service would output
peer dependency warnings for cluster-ui dependency.

This change updates peer dependencies to remove warnings.

Note: this will also be backported to 21.1 and 20.2, for
respective cluster-ui-21-1 and cluster-ui-20-2 packages.

Release note: None

Co-authored-by: Lauren Barker <[email protected]>
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@laurenbarker laurenbarker requested a review from a team July 16, 2021 20:36
Copy link
Contributor

@laurenbarker laurenbarker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @celiala and @dhartunian)


pkg/ui/cluster-ui/package.json, line 135 at r1 (raw file):

  },
  "peerDependencies": {
    "protobufjs": "6.8.6",

This dependency isn't installed in CC Console.


pkg/ui/cluster-ui/package.json, line 135 at r1 (raw file):

  },
  "peerDependencies": {
    "react": ">=16.12.0",

We've been on react v17+ and redux v4.1+ in CC Console for a couple months now and it doesn't seem to be causing any issues.

@dhartunian dhartunian removed their request for review July 19, 2021 15:45
@celiala celiala requested a review from nathanstilwell July 20, 2021 13:51
@nathanstilwell nathanstilwell requested review from koorosh and removed request for a team July 20, 2021 19:20
Copy link
Contributor

@nathanstilwell nathanstilwell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @koorosh and @laurenbarker)


pkg/ui/cluster-ui/package.json, line 135 at r1 (raw file):

Previously, laurenbarker (Lauren Barker) wrote…

This dependency isn't installed in CC Console.

I think that's right. I believe we don't need this anymore since the protobuf clients are being locally linked.


pkg/ui/cluster-ui/package.json, line 135 at r1 (raw file):

Previously, laurenbarker (Lauren Barker) wrote…

We've been on react v17+ and redux v4.1+ in CC Console for a couple months now and it doesn't seem to be causing any issues.

DB Console still uses these versions even though CC Console has forged ahead. What I'm wondering is since this package is only published for CC Console if we could increase the peer dependency versions to the CC Console versions as DB Console depends on this package locally. Either way, I'm fine with these versions.

Copy link
Collaborator

@koorosh koorosh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @laurenbarker)

@celiala
Copy link
Collaborator Author

celiala commented Jul 22, 2021

TFTRs!

bors r+

@craig
Copy link
Contributor

craig bot commented Jul 22, 2021

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Jul 22, 2021

Build succeeded:

@craig craig bot merged commit c7e35f8 into cockroachdb:master Jul 22, 2021
@blathers-crl
Copy link

blathers-crl bot commented Jul 22, 2021

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 8ea0d5b to blathers/backport-release-2.0-67722: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 2.0.x failed. See errors above.


error creating merge commit from 8ea0d5b to blathers/backport-release-2.1-67722: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 2.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

celiala added a commit to celiala/cockroach that referenced this pull request Jul 23, 2021
In cockroachdb#67722, we updated peerDependencies, but forgot to bump
the version in package.json.

This fast-follow PR bumps the version for cockroachdb#67722.

Release note: None

Co-authored-by: Lauren Barker <[email protected]>
craig bot pushed a commit that referenced this pull request Jul 27, 2021
67989: cluster-ui: bump package.json version r=celiala a=celiala

In #67722, we updated peerDependencies, but forgot to bump
the version in package.json.

This fast-follow PR bumps the version for #67722.

Note: this has been preemptively backported to 21.1 and 20.2, in #67981 and #67982 respectively.


Release note: None

68088: roachtest: create perf dir for bulk roachtests r=pbardea a=pbardea

When the bulk op roachtests were updated to avoid racing when writing
their stats files, the creation of the perf directory itself was
removed. This adds it back.

There was some consideration to update PutString to create the
filepath.Dir of its destination but that refactor was left for a
potential follow up since it applies to other tests as well.

Fixes #67870.

Release note: None

68118: roachtest: bump import/tpch/nodes=8 timeout to 10h r=tbg,pbardea a=adityamaru

Previously, the roachtest had a timeout of 8h. The test
usually runs in ~7hrs but occasionally tips over the
configured time out. While we investigate the slowness
of this import as tracked in #68117,
we are bumping the timeout to 10h.

Release note: None

68119: rowexec: ask for at least 8MiB in the join reader memory limit r=yuzefovich a=yuzefovich

The join reader doesn't know how to spill to disk, so previously in some
cases (namely, when `distsql_workmem` session variable is low) the
queries would error out. Now this is temporarily fixed by requiring the
memory limit to be at least 8MiB (to accommodate 4MiB scratch input
rows). This shouldn't really matter in the production setting but makes
`tpchvec/disk` roachtest happy.

Fixes: #68036.

Release note: None

Co-authored-by: Celia La <[email protected]>
Co-authored-by: Paul Bardea <[email protected]>
Co-authored-by: Aditya Maru <[email protected]>
Co-authored-by: Yahor Yuzefovich <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants