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

Rebase the TiKV branch on to master #3

Closed
wants to merge 200 commits into from
Closed

Rebase the TiKV branch on to master #3

wants to merge 200 commits into from

Conversation

nrc
Copy link

@nrc nrc commented Feb 15, 2020

So, some of our changes got upstreamed, but did not (in particular, io and mem load). So rather than use the old tikv branch, I rebased it to current sysinfo master. I've removed some code which has alternatives in upstream. I think that we can work to upstream the other stuff, but in the meantime I need something so I can run TiKV tests on my machine.

Unfortunately, since this is a rebase, it cannot be merged with the tikv branch. If this PR passes review I propose we create a new branch, tikv2 or something, to land it rather than merging this PR into our master.

PTAL @lonng

…-temperatures

Add specific path to get raspberry pi CPU temperature
GuillaumeGomez and others added 21 commits February 8, 2020 16:12
Fix error with networks and total outcome on Linux
Document how to cross compile with proper Cargo configuration
@nrc nrc requested a review from lonng February 15, 2020 07:38
@lonng
Copy link
Member

lonng commented Feb 15, 2020

Hi, @nrc Can we move some changes which cannot be merged to upstream to an individual repository? And use upstream sysinfo in TiKV directly. And the new repo (how about sysload?) is used to maintain load functions, which can be reused by others and reduce the complexity of maintenance.

@GuillaumeGomez
Copy link

For information: I intend to add I/O information at some point. But in the meantime, you'll have to continue using your own code.

Signed-off-by: Nick Cameron <[email protected]>
@nrc
Copy link
Author

nrc commented Feb 16, 2020

Hi, @nrc Can we move some changes which cannot be merged to upstream to an individual repository?

We could, but I think not now - this PR is an improvement on the current situation, and the better long-term solution is to upstream everything. If that is not possible (I think it should be), then we can make another repo.

Copy link
Member

@lonng lonng left a comment

Choose a reason for hiding this comment

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

LGTM

@nrc
Copy link
Author

nrc commented Feb 17, 2020

This is now https://github.com/tikv/sysinfo/tree/tikv2

@nrc nrc closed this Feb 17, 2020
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.

6 participants