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

[libpq][hack] Workaround for libpq #214

Merged
merged 4 commits into from
Sep 1, 2021
Merged

[libpq][hack] Workaround for libpq #214

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0059667
Workaround for libpq
smklein Sep 1, 2021
bc54efb
Update readme
smklein Sep 1, 2021
7c5c848
Review feedback
smklein Sep 1, 2021
d881b90
rm feedback
smklein Sep 1, 2021
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
16 changes: 16 additions & 0 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,22 @@ However, once these have been provided, the codebase should be buildable with `c

**Prerequisites:**

. Postgres

Postgres is required to link against libpq for access to the database.

(See https://github.com/oxidecomputer/omicron/issues/213 ; we may be able to remove this dependency long-term)

Linux: `sudo apt-get install libpq-dev`
Mac: `brew install postgresql`
Helios: `pkg install library/postgresql-13`

Additionally, to help all runtime commands find this library, we recommend the following:
[source,text]
----
export LD_LIBRARY_PATH="$(pg_config --libdir)"
----

. CockroachDB v20.2.5.
+
The test suite expects to be able to start a single-node CockroachDB cluster using the `cockroach` executable on your PATH.
Expand Down
2 changes: 1 addition & 1 deletion smf/bootstrap-agent/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dependency>

<exec_method type='method' name='start'
exec='ctrun -l child -o noorphan,regent /opt/oxide/bootstrap-agent/bootstrap-agent run %{config/server_id} %{config/server_addr} &amp;'
exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/bootstrap-agent/bootstrap-agent run %{config/server_id} %{config/server_addr} &amp;'
smklein marked this conversation as resolved.
Show resolved Hide resolved
timeout_seconds='0' />
<exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />

Expand Down
2 changes: 1 addition & 1 deletion smf/nexus/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</dependency>

<exec_method type='method' name='start'
exec='ctrun -l child -o noorphan,regent /opt/oxide/nexus/nexus /opt/oxide/nexus/pkg/config.toml &amp;'
exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/nexus/nexus /opt/oxide/nexus/pkg/config.toml &amp;'
timeout_seconds='0' />
<exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />

Expand Down
2 changes: 1 addition & 1 deletion smf/oximeter/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</dependency>

<exec_method type='method' name='start'
exec='ctrun -l child -o noorphan,regent /opt/oxide/oximeter/oximeter ./config.toml &amp;'
exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/oximeter/oximeter ./config.toml &amp;'
timeout_seconds='0' />
<exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />

Expand Down
2 changes: 1 addition & 1 deletion smf/propolis-server/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</dependency>

<exec_method type='method' name='start'
exec='ctrun -l child -o noorphan,regent /opt/oxide/propolis-server/propolis-server /opt/oxide/propolis-server/pkg/config.toml %{config/server_addr} &amp;'
exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/propolis-server/propolis-server /opt/oxide/propolis-server/pkg/config.toml %{config/server_addr} &amp;'
timeout_seconds='0' />
<exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />

Expand Down
2 changes: 1 addition & 1 deletion smf/sled-agent/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</dependency>

<exec_method type='method' name='start'
exec='ctrun -l child -o noorphan,regent /opt/oxide/sled-agent/sled-agent run %{svc:/system/illumos/bootstrap-agent:default/:properties/config/server_id} %{config/server_addr} %{config/nexus_addr} &amp;'
exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/sled-agent/sled-agent run %{svc:/system/illumos/bootstrap-agent:default/:properties/config/server_id} %{config/server_addr} %{config/nexus_addr} &amp;'
timeout_seconds='0' />
<exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />

Expand Down