Skip to content

Commit 3d6e8c8

Browse files
authored
Use clone_from() as it performs better in some cases (#520)
Also update github workflow to use new quest format Fixes #519
1 parent 1a1c340 commit 3d6e8c8

File tree

5 files changed

+9
-101
lines changed

5 files changed

+9
-101
lines changed

docker-compose-load-test.yaml renamed to .github/docker-compose-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ services:
5858
delay: 20s
5959
max_attempts: 3
6060

61-
quest-load:
61+
quest:
6262
image: ghcr.io/parseablehq/quest:main
6363
command: ["load", "http://parseable:8000", "parseableadmin", "parseableadmin", "20"]
6464
networks:

.github/workflows/integration-test.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Integration tests
1+
name: Load tests
22

33
on:
44
pull_request:
@@ -11,13 +11,13 @@ on:
1111
jobs:
1212

1313
docker-compose-test:
14-
name: Docker Compose integration tests
14+
name: Docker Compose based load tests
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v3
1919
- name: Start compose
20-
run: docker-compose -f docker-compose-smoke-test.yaml up --build --exit-code-from quest-smoke
20+
run: docker-compose -f ./.github/docker-compose-test.yaml up --build --exit-code-from quest
2121
- name: Stop compose
2222
if: always()
23-
run: docker-compose -f docker-compose-smoke-test.yaml down
23+
run: docker-compose -f ./.github/docker-compose-test.yaml down

.github/workflows/load-test.yaml

-23
This file was deleted.

docker-compose-smoke-test.yaml

-72
This file was deleted.

server/src/rbac/map.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,10 @@ pub fn init(metadata: &StorageMetadata) {
9191
let users = metadata.users.clone();
9292
let mut roles = metadata.roles.clone();
9393

94-
*DEFAULT_ROLE.lock().unwrap() = metadata.default_role.clone();
94+
DEFAULT_ROLE
95+
.lock()
96+
.unwrap()
97+
.clone_from(&metadata.default_role);
9598

9699
let admin_privilege = DefaultPrivilege::Admin;
97100
let admin_permissions = RoleBuilder::from(&admin_privilege).build();

0 commit comments

Comments
 (0)