Skip to content

Commit d27962b

Browse files
committed
Revert changes to setup-fdb.yml
This validates that if you don't have fdb-environment.yaml the tests still pass (except the one with an assumption check)
1 parent 1e5552f commit d27962b

File tree

1 file changed

+6
-51
lines changed

1 file changed

+6
-51
lines changed

actions/setup-fdb/action.yml

Lines changed: 6 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -31,57 +31,12 @@ runs:
3131
- name: Install FDB Server
3232
shell: bash
3333
run: sudo dpkg -i ~/.fdb-cache/${{ steps.fdb_filenames.outputs.client_deb }} ~/.fdb-cache/${{ steps.fdb_filenames.outputs.server_deb }}
34-
- name: Stop default fdb
34+
- name: Fix FDB Network Addresses
3535
shell: bash
36-
run: sudo service foundationdb stop
37-
38-
- name: Create cluster1 config
39-
shell: bash
40-
run: |
41-
sudo cp /etc/foundationdb/foundationdb.conf /etc/foundationdb/foundationdb1.conf
42-
43-
sudo sed -i -e "s/\/etc\/foundationdb\/fdb.cluster/\/etc\/foundationdb\/fdb1.cluster/g" \
44-
-e "s/\/var\/log\/foundationdb/\/var\/log\/foundationdb1/" \
45-
-e "s/fdbserver.4500/fdbserver.4600/g" \
46-
/etc/foundationdb/foundationdb1.conf
47-
48-
sudo bash -c "echo 'fdb1:$(mktemp -u XXXXXXXX)@127.0.0.1:4600' > /etc/foundationdb/fdb1.cluster"
49-
- name: Create cluster2 config
36+
run: sudo sed -i -e "s/public_address = auto:\$ID/public_address = 127.0.0.1:\$ID/g" -e "s/listen_address = public/listen_address = 0.0.0.0:\$ID/g" /etc/foundationdb/foundationdb.conf
37+
- name: Start FDB Server
5038
shell: bash
51-
run: |
52-
sudo cp /etc/foundationdb/foundationdb.conf /etc/foundationdb/foundationdb2.conf
53-
54-
sudo sed -i -e "s/\/etc\/foundationdb\/fdb.cluster/\/etc\/foundationdb\/fdb2.cluster/g" \
55-
-e "s/\/var\/log\/foundationdb/\/var\/log\/foundationdb2/" \
56-
-e "s/fdbserver.4500/fdbserver.4700/g" \
57-
/etc/foundationdb/foundationdb2.conf
58-
59-
sudo bash -c "echo 'fdb2:$(mktemp -u XXXXXXXX)@127.0.0.1:4700' > /etc/foundationdb/fdb2.cluster"
60-
61-
- name: create dirs & set permissions
39+
run: sudo /usr/lib/foundationdb/fdbmonitor /etc/foundationdb/foundationdb.conf --daemonize
40+
- name: Switch FDB to SSD
6241
shell: bash
63-
run: |
64-
sudo mkdir /var/log/foundationdb1 /var/log/foundationdb2
65-
sudo chown foundationdb:foundationdb /etc/foundationdb/fdb1.cluster /etc/foundationdb/fdb2.cluster /var/log/foundationdb1 /var/log/foundationdb2
66-
sudo chmod 664 /etc/foundationdb/fdb1.cluster /etc/foundationdb/fdb2.cluster
67-
sudo chmod 700 /var/log/foundationdb1 /var/log/foundationdb2
68-
69-
- name: Start FDB Server 1
70-
shell: bash
71-
run: sudo /usr/lib/foundationdb/fdbmonitor --conffile /etc/foundationdb/foundationdb1.conf --lockfile /var/run/fdbmonitor1.pid --loggroup fdb1 --daemonize
72-
- name: Start FDB Server 2
73-
shell: bash
74-
run: sudo /usr/lib/foundationdb/fdbmonitor --conffile /etc/foundationdb/foundationdb2.conf --lockfile /var/run/fdbmonitor2.pid --loggroup fdb2 --daemonize
75-
76-
- name: Switch FDB 1 to SSD
77-
shell: bash
78-
run: fdbcli -C /etc/foundationdb/fdb1.cluster --exec "configure new single ssd storage_migration_type=aggressive; status"
79-
- name: Switch FDB 2 to SSD
80-
shell: bash
81-
run: fdbcli -C /etc/foundationdb/fdb2.cluster --exec "configure new single ssd storage_migration_type=aggressive; status"
82-
- name: Create fdb-environment.yaml
83-
shell: bash
84-
run: |
85-
echo "clusterFiles: " >> fdb-environment.yaml
86-
echo " - /etc/foundationdb/fdb1.cluster" >> fdb-environment.yaml
87-
echo " - /etc/foundationdb/fdb2.cluster" >> fdb-environment.yaml
42+
run: fdbcli --exec "configure single ssd storage_migration_type=aggressive; status"

0 commit comments

Comments
 (0)