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
cockroachdb: fix license #88804
cockroachdb: fix license #88804
Conversation
Note: tests pass with the following patch, which I'm not sure I should apply? diff --git a/nixos/tests/cockroachdb.nix b/nixos/tests/cockroachdb.nix
index d0cc5e19837..9ea271fb49e 100644
--- a/nixos/tests/cockroachdb.nix
+++ b/nixos/tests/cockroachdb.nix
@@ -92,9 +92,6 @@ let
# Hold startup until Chrony has performed its first measurement (which
# will probably result in a full timeskip, thanks to makestep)
- systemd.services.cockroachdb.preStart = ''
- ${pkgs.chrony}/bin/chronyc waitsync
- '';
};
in import ./make-test-python.nix ({ pkgs, ...} : { |
@anmonteiro it seems this was once necessary, as cockroachdb was very sensitive to slightly differing clocks. Did you read the long comment section in On master, I tried removing all the chrony parts and immediately was able to get nodes kicked out of the cluster:
I didn't try on your PR. Are you aware of any changes done in cockroachdb 20.x regarding that? |
@flokli thanks for the suggestion. I just tried removing all the chrony parts and I do get the same behavior that you describe, suggesting nothing changed in CockroachDB v20.1. Let me restate my comment in the original post that opened the PR, as it could probably be clearer: with the current test definitions, I'm suspicious that I'm trying other alternative commands to make tests pass. In the meantime, I'm open to other suggestions. |
Ok, so some more investigation revealed that the chronyd service in the VM just doesn't start because it's missing It sounds like I just can't run the tests locally, so I'd appreciate someone trying it out. This setup is working for me locally, while I'm developing against CockroachDB, but I have admittedly not tried the multi-node setup. |
@thoughtpolice can you give this a look, especially w.r.t. #51338? |
This has been mostly superseded by a bump to 20.1.4. This now only adds the license change, which we're still missing. |
I just rebased this on master, and now the diff only contains the license change. |
This does not seem to be rebased, but merged - now containing 3 commits. Can you rebase this, so it's a single commit changing the license? |
5e181bb
to
c7b9b3d
Compare
@flokli I just squashed the commits as you suggested. |
Motivation for this change
https://www.cockroachlabs.com/docs/releases/v20.1.0.html
Note: also changes the license to BSL as per https://www.cockroachlabs.com/docs/v20.1/licensing-faqs.html
P.S.: I couldn't manage to run the tests on my machine, as qemu kept timing out starting the CRDB server. I did, however, try out the binary and start a server locally with
./result/bin/cockroach start --insecure
and things appear to be functioning normally.Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)