Skip to content

Commit

Permalink
Merge pull request #447 from CodeLieutenant/master
Browse files Browse the repository at this point in the history
fix(scylla): failed to start scylla due to fs.aio limit
  • Loading branch information
dkropachev authored Dec 23, 2024
2 parents 4fdaa76 + 1157b2c commit e0d40ab
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:

jobs:
goreleaser:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerhub-description.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- .github/workflows/dockerhub-description.yml
jobs:
description:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
build:
name: Lint Test and Build
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name:
uses: actions/checkout@v4
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name:
uses: actions/checkout@v4
Expand All @@ -31,9 +31,9 @@ jobs:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
needs: [build]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
max-parallel: 1
max-parallel: 4
matrix:
gemini-features: ["basic", "normal"]
gemini-concurrency: [4]
Expand All @@ -49,6 +49,10 @@ jobs:
id: scylla
shell: bash
run: |
ulimit -n 65536
sudo sysctl -w fs.aio-max-nr=30000000
sudo sysctl -w fs.file-max=30000000
chmod +x ./bin/gemini
make scylla-setup \
SCYLLA_TEST_VERSION=${{ matrix.test-scylla-version }} \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:

jobs:
goreleaser:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ setup: $(GOBIN)/golangci-lint scylla-setup debug-build
scylla-setup:
@docker compose -f docker/docker-compose-$(DOCKER_COMPOSE_TESTING).yml up -d

until docker logs gemini-oracle 2>&1 | grep "Starting listening for CQL clients" > /dev/null; do sleep 0.2; done
until docker logs gemini-test 2>&1 | grep "Starting listening for CQL clients" > /dev/null; do sleep 0.2; done


.PHONY: scylla-shutdown
scylla-shutdown:
@docker compose -f docker/docker-compose-$(DOCKER_COMPOSE_TESTING).yml down --volumes
Expand Down

0 comments on commit e0d40ab

Please sign in to comment.