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.

Sign up for GitHub

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

Fix ma start timeout #12

Merged
merged 3 commits into from
Jun 11, 2024
Merged

Fix ma start timeout #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f53f24f
fix variable expansion in Makefile
andrii-suse Jun 11, 2024
fc3bf3d
Implement proper retry logic in ma-local/start
andrii-suse Jun 11, 2024
85f5e91
ci: do not test on push unless master
andrii-suse Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

name: CI

on: [push, pull_request, workflow_dispatch]
on:
push:
branches:
- master
pull_request: {}

jobs:
test:
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ install:
done

test:
for f in product/*/t/*.sh ; do bash -x $f && continue; echo FAIL: $f; break; done
for f in product/*/t/*.sh ; do bash -x $$f && continue; echo FAIL: $$f; break; done

test_leap:
for f in product/ap/*/*.sh; do echo starting $f; ENVIRON_TEST_IMAGE=registry.opensuse.org/opensuse/leap $f && continue; echo FAIL $f; break; done
for f in product/ap/*/*.sh; do echo starting $$f; ENVIRON_TEST_IMAGE=registry.opensuse.org/opensuse/leap $$f && continue; echo FAIL $$f; break; done

test_tw:
for f in product/ap/*/*.sh; do echo starting $f; ENVIRON_TEST_IMAGE=registry.opensuse.org/opensuse/tumbleweed $f && continue; echo FAIL $f; break; done
for f in product/ap/*/*.sh; do echo starting $$f; ENVIRON_TEST_IMAGE=registry.opensuse.org/opensuse/tumbleweed $$f && continue; echo FAIL $$f; break; done
13 changes: 5 additions & 8 deletions product/ma/local/start.sh.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@ set -e
[ -d __workdir/dt ] || mkdir __workdir/dt
[ -f __datadir/ibdata1 ] || __workdir/init_datadir

/usr/sbin/mariadbd --datadir=__datadir --user=$USER --socket=__workdir/.sock --skip-networking --log-error=__workdir/.cerr --pid-file=__workdir/.pid "$@" &
eatmydata=$(which eatmydata 2>/dev/null) || :

$eatmydata /usr/sbin/mariadbd --datadir=__datadir --user=$USER --socket=__workdir/.sock --skip-networking --log-error=__workdir/.cerr --pid-file=__workdir/.pid "$@" &

sleep 0.1
__workdir/status >& /dev/null || sleep 0.1
__workdir/status >& /dev/null || sleep 0.1
__workdir/status >& /dev/null || sleep 0.1
__workdir/status >& /dev/null || sleep 0.1
__workdir/status >& /dev/null || sleep 0.1
__workdir/status >& /dev/null || sleep 0.1
__workdir/status >& /dev/null || sleep 1

(r=150; while ! __workdir/status >& /dev/null ; do ((--r))||exit 1; sleep 0.1 ;done)
Loading