mirror of
https://github.com/neondatabase/neon.git
synced 2026-01-10 15:02:56 +00:00
53f438a8a8
We use the term "endpoint" in for compute Postgres nodes in the web UI
and user-facing documentation now. Adjust the nomenclature in the code.
This changes the name of the "neon_local pg" command to "neon_local
endpoint". Also adjust names of classes, variables etc. in the python
tests accordingly.
This also changes the directory structure so that endpoints are now
stored in:
.neon/endpoints/<endpoint id>
instead of:
.neon/pgdatadirs/tenants/<tenant_id>/<endpoint (node) name>
The tenant ID is no longer part of the path. That means that you
cannot have two endpoints with the same name/ID in two different
tenants anymore. That's consistent with how we treat endpoints in the
real control plane and proxy: the endpoint ID must be globally unique.
54 lines
1.7 KiB
Python
54 lines
1.7 KiB
Python
import os.path
|
|
import shutil
|
|
import subprocess
|
|
import threading
|
|
import time
|
|
from contextlib import closing
|
|
|
|
from fixtures.log_helper import log
|
|
from fixtures.neon_fixtures import NeonEnv
|
|
|
|
|
|
def lsof_path() -> str:
|
|
path_output = shutil.which("lsof")
|
|
if path_output is None:
|
|
raise RuntimeError("lsof not found in PATH")
|
|
else:
|
|
return path_output
|
|
|
|
|
|
# Makes sure that `pageserver.pid` is only held by `pageserve` command, not other commands.
|
|
# This is to test the changes in https://github.com/neondatabase/neon/pull/1834.
|
|
def test_lsof_pageserver_pid(neon_simple_env: NeonEnv):
|
|
env = neon_simple_env
|
|
|
|
def start_workload():
|
|
env.neon_cli.create_branch("test_lsof_pageserver_pid")
|
|
endpoint = env.endpoints.create_start("test_lsof_pageserver_pid")
|
|
with closing(endpoint.connect()) as conn:
|
|
with conn.cursor() as cur:
|
|
cur.execute("CREATE TABLE foo as SELECT x FROM generate_series(1,100000) x")
|
|
cur.execute("update foo set x=x+1")
|
|
|
|
workload_thread = threading.Thread(target=start_workload, args=(), daemon=True)
|
|
workload_thread.start()
|
|
|
|
path = os.path.join(env.repo_dir, "pageserver.pid")
|
|
lsof = lsof_path()
|
|
while workload_thread.is_alive():
|
|
res = subprocess.run(
|
|
[lsof, path],
|
|
check=False,
|
|
universal_newlines=True,
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.PIPE,
|
|
)
|
|
|
|
# parse the `lsof` command's output to get only the list of commands
|
|
commands = [line.split(" ")[0] for line in res.stdout.strip().split("\n")[1:]]
|
|
if len(commands) > 0:
|
|
log.info(f"lsof commands: {commands}")
|
|
assert commands == ["pageserve"]
|
|
|
|
time.sleep(1.0)
|