From 69c0045bffc3d17655633d25cd4b18fc19576ac1 Mon Sep 17 00:00:00 2001 From: Jack Lin Date: Wed, 6 Mar 2024 19:10:45 +0800 Subject: [PATCH] fix(instance-maanger): add ldflags when building instance manager ref: longhorn/longhorn 8094 Signed-off-by: Jack Lin --- Dockerfile.dapper | 2 +- integration/instance/test_launcher_basic.py | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index fd55c4769..625768fdf 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -138,7 +138,7 @@ RUN cd integration && \ RUN cd /go/src/github.com/longhorn && \ git clone https://github.com/longhorn/longhorn-instance-manager.git && \ cd longhorn-instance-manager && \ - go build -o ./longhorn-instance-manager && \ + go build -o ./longhorn-instance-manager -tags netgo -ldflags "-linkmode external -extldflags -static" && \ cp -r integration/rpc/ ${DAPPER_SOURCE}/integration/rpc/ && \ install longhorn-instance-manager /usr/local/bin diff --git a/integration/instance/test_launcher_basic.py b/integration/instance/test_launcher_basic.py index ee7e7765b..0a56cb6cc 100644 --- a/integration/instance/test_launcher_basic.py +++ b/integration/instance/test_launcher_basic.py @@ -1,7 +1,6 @@ import tempfile import pytest -import grpc from common.core import ( create_replica_process, create_engine_process, @@ -18,6 +17,7 @@ from common.constants import ( LONGHORN_UPGRADE_BINARY, SIZE, PROC_STATE_RUNNING, PROC_STATE_STOPPING, PROC_STATE_STOPPED, + PROC_STATE_ERROR, VOLUME_NAME_BASE, ENGINE_NAME_BASE, REPLICA_NAME_BASE, REPLICA_NAME, REPLICA_2_NAME, SIZE_STR, INSTANCE_MANAGER_REPLICA, @@ -80,17 +80,15 @@ def test_process_creation_failure(pm_client): # NOQA for i in range(count): tmp_dir = tempfile.mkdtemp() name = REPLICA_NAME_BASE + str(i) - args = ["replica", tmp_dir, "--size", str(SIZE)] - with pytest.raises(grpc.RpcError) as e: - pm_client.process_create( - name=name, binary="/engine-binaries/opt/non-existing-binary", - args=args, port_count=15, port_args=["--listen,localhost:"]) - assert e.value.code() == grpc.StatusCode.INVALID_ARGUMENT + pm_client.process_create( + name=name, binary="/engine-binaries/opt/non-existing-binary", + args=args, port_count=15, port_args=["--listen,localhost:"]) rs = pm_client.process_list() - assert len(rs) == 0 - + assert len(rs) == 5 + for name, r in rs.items(): + assert r.status.state == PROC_STATE_ERROR def test_one_volume(pm_client, em_client): # NOQA rs = pm_client.process_list()