Skip to content

Commit 107cd1c

Browse files
authored
Merge pull request #18 from seeker89/fixes
Various fixes, mainly due to upgrading to Ubuntu 20.20
2 parents 4aadd98 + 6746ef8 commit 107cd1c

File tree

4 files changed

+27
-9
lines changed

4 files changed

+27
-9
lines changed

examples/killer-whiles/cereal_killer.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ps auxf | grep killer-whiles | grep python
55
echo
66

77
echo "Killing instance A (port 8001)"
8-
ps auxf | grep 8001 | awk '{system("sudo kill " $2)}'
8+
ps auxf | grep python | grep 8001 | awk '{system("sudo kill " $2)}'
99
sleep 0.5
1010
systemctl status faas001_a --no-pager
1111
echo
@@ -15,7 +15,7 @@ sleep 2
1515
echo
1616

1717
echo "Killing instance B (port 8002)"
18-
ps auxf | grep 8002 | awk '{system("sudo kill " $2)}'
18+
ps auxf | grep python | grep 8002 | awk '{system("sudo kill " $2)}'
1919
sleep 0.5
2020
systemctl status faas001_b --no-pager
2121
echo

examples/kubernetes/experiment2b.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
config:
2+
runStrategy:
3+
runs: 1
4+
scenarios:
5+
- name: Toxiproxy latency
6+
steps:
7+
- clone:
8+
source:
9+
deployment:
10+
name: goldpinger
11+
namespace: default
12+
replicas: 2
13+
mutations:
14+
- toxiproxy:
15+
toxics:
16+
- targetProxy: "8080"
17+
toxicType: latency
18+
toxicAttributes:
19+
- name: latency
20+
value: 250
21+
- wait:
22+
seconds: 120

examples/poking-docker/new-filesystem.sh

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ echo "Step 2. Copy some (very) minimal binaries"
1111
for tool in $TOOLS; do
1212
cp -v --parents `which $tool` $NEW_FILESYSTEM_ROOT;
1313
done
14+
# link /bin/bash to /usr/bin/bash to match Ubuntu 20.20
15+
mkdir -p $NEW_FILESYSTEM_ROOT/bin
16+
ln -s ../usr/bin/bash $NEW_FILESYSTEM_ROOT/bin/bash
1417

1518
echo "Step 3. Copy over their libs"
1619
# use ldd to find the dependencies of the tools we've just copied

vm/ansible/prerequisites/tasks/main.yml

-7
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,6 @@
179179
quit
180180
EOF
181181
182-
- name: Make sure mysql database listens on all interfaces
183-
become: true
184-
lineinfile:
185-
path: /lib/systemd/system/mysql.service
186-
regexp: '^ExecStart='
187-
line: 'ExecStart=/usr/sbin/mysqld --daemonize --pid-file=/run/mysqld/mysqld.pid --bind-address=0.0.0.0 --port=3306'
188-
189182
# Stop services from starting on boot time
190183
- name: Disable auto-boot services
191184
become: true

0 commit comments

Comments
 (0)