Skip to content

Commit 76e2b92

Browse files
committed
DLPX-82895 default value for "fs.inotify.max_user_watches" is insufficient for the scale release testing setup
PR URL: https://www.github.com/delphix/delphix-platform/pull/426
1 parent 2bdf701 commit 76e2b92

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.github/workflows/main.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,46 @@ on: [push, pull_request]
22

33
jobs:
44
check-packages:
5-
runs-on: ubuntu-18.04
5+
runs-on: ubuntu-latest
66
steps:
77
- uses: actions/checkout@v2
88
- run: docker build -t delphix-platform:latest docker
99
- run: ./scripts/docker-run.sh make packages
1010
check-shellcheck:
11-
runs-on: ubuntu-18.04
11+
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v2
1414
- uses: delphix/actions/shellcheck@master
1515
check-shfmt:
16-
runs-on: ubuntu-18.04
16+
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v2
1919
- uses: delphix/actions/shfmt@master
2020
check-pylint:
21-
runs-on: ubuntu-18.04
21+
runs-on: ubuntu-latest
2222
steps:
2323
- uses: actions/checkout@v2
2424
- uses: actions/setup-python@v1
2525
with:
26-
python-version: '3.6'
26+
python-version: '3.8'
2727
- run: python3 -m pip install pylint
2828
- run: python3 -m pip install netifaces
2929
- run: pylint -d invalid-name,E0611 files/common/usr/bin/delphix-startup-screen
3030
check-yapf:
31-
runs-on: ubuntu-18.04
31+
runs-on: ubuntu-latest
3232
steps:
3333
- uses: actions/checkout@v2
3434
- uses: actions/setup-python@v1
3535
with:
36-
python-version: '3.6'
36+
python-version: '3.8'
3737
- run: python3 -m pip install yapf
3838
- run: yapf --diff --style google files/common/usr/bin/delphix-startup-screen
3939
check-mypy:
40-
runs-on: ubuntu-18.04
40+
runs-on: ubuntu-latest
4141
steps:
4242
- uses: actions/checkout@v2
4343
- uses: actions/setup-python@v1
4444
with:
45-
python-version: '3.6'
45+
python-version: '3.8'
4646
- run: python3 -m pip install mypy
4747
- run: mypy --ignore-missing-imports files/common/usr/bin/delphix-startup-screen

files/common/lib/sysctl.d/50-override.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,4 @@ fs.mount-max = 300000
9292
# We've seen cases where we run out of this resource with the default
9393
# value of 8192, resulting in upgrade failures.
9494
#
95-
fs.inotify.max_user_watches = 16384
95+
fs.inotify.max_user_watches = 32768

files/common/usr/bin/delphix-startup-screen

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def get_svcs() -> List[str]:
5555
return cp.stdout.split("=", 1)[1].split()
5656

5757

58-
def run_svcs(options: str = None) -> Generator:
58+
def run_svcs(options: str = "") -> Generator:
5959
"""
6060
Run the command to retrieve the status of all the services. The options
6161
argument can be used to obtain additional output from the 'systemctl'
@@ -245,7 +245,7 @@ def display_status(stdscr, win):
245245
status = 0
246246

247247
x = int((X - width) / 2) + 2
248-
y = (Y - height)
248+
y = Y - height
249249

250250
win.clear()
251251
win.box()

0 commit comments

Comments
 (0)