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

Jump to bottom

[BUG] Fix coordinator pulsar tenant and namespace #1650

Merged
merged 2 commits into from
Jan 17, 2024
Merged

[BUG] Fix coordinator pulsar tenant and namespace #1650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ecef68
fix coordinator pointing to pulsar
HammadB Jan 16, 2024
6aea07b
Align rust worker too
HammadB Jan 16, 2024
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
9 changes: 6 additions & 3 deletions chromadb/test/db/test_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,16 @@
from pytest import FixtureRequest
import uuid

PULSAR_TENANT = "default"
PULSAR_NAMESPACE = "default"

# These are the sample collections that are used in the tests below. Tests can override
# the fields as needed.
sample_collections = [
Collection(
id=uuid.UUID(int=1),
name="test_collection_1",
topic="persistent://test-tenant/test-topic/00000000-0000-0000-0000-000000000001",
topic=f"persistent://{PULSAR_TENANT}/{PULSAR_NAMESPACE}/00000000-0000-0000-0000-000000000001",
metadata={"test_str": "str1", "test_int": 1, "test_float": 1.3},
dimension=128,
database=DEFAULT_DATABASE,
Expand All @@ -35,7 +38,7 @@
Collection(
id=uuid.UUID(int=2),
name="test_collection_2",
topic="persistent://test-tenant/test-topic/00000000-0000-0000-0000-000000000002",
topic=f"persistent://{PULSAR_TENANT}/{PULSAR_NAMESPACE}/00000000-0000-0000-0000-000000000002",
metadata={"test_str": "str2", "test_int": 2, "test_float": 2.3},
dimension=None,
database=DEFAULT_DATABASE,
Expand All @@ -44,7 +47,7 @@
Collection(
id=uuid.UUID(int=3),
name="test_collection_3",
topic="persistent://test-tenant/test-topic/00000000-0000-0000-0000-000000000003",
topic=f"persistent://{PULSAR_TENANT}/{PULSAR_NAMESPACE}/00000000-0000-0000-0000-000000000003",
metadata={"test_str": "str3", "test_int": 3, "test_float": 3.3},
dimension=None,
database=DEFAULT_DATABASE,
Expand Down
2 changes: 1 addition & 1 deletion go/coordinator/cmd/grpccoordinator/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func init() {
// Pulsar
Cmd.Flags().StringVar(&conf.PulsarAdminURL, "pulsar-admin-url", "http://localhost:8080", "Pulsar admin url")
Cmd.Flags().StringVar(&conf.PulsarURL, "pulsar-url", "pulsar://localhost:6650", "Pulsar url")
Cmd.Flags().StringVar(&conf.PulsarTenant, "pulsar-tenant", "public", "Pulsar tenant")
Cmd.Flags().StringVar(&conf.PulsarTenant, "pulsar-tenant", "default", "Pulsar tenant")
Cmd.Flags().StringVar(&conf.PulsarNamespace, "pulsar-namespace", "default", "Pulsar namespace")

// Notification
Expand Down
3 changes: 0 additions & 3 deletions k8s/deployment/kubernetes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,6 @@ spec:
- "--pulsar-admin-url=http://pulsar.chroma:8080"
- "--pulsar-url=pulsar://pulsar.chroma:6650"
- "--notifier-provider=pulsar"
- "--pulsar-tenant=test-tenant"
- "--pulsar-namespace=test-topic"
- "--assignment-policy=simple"
image: chroma-coordinator
imagePullPolicy: IfNotPresent
name: coordinator
Expand Down
4 changes: 4 additions & 0 deletions k8s/deployment/segment-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ spec:
env:
- name: CHROMA_WORKER__PULSAR_URL
value: pulsar://pulsar.chroma:6650
- name: CHROMA_WORKER__PULSAR_NAMESPACE
value: default
- name: CHROMA_WORKER__PULSAR_TENANT
value: default
- name: CHROMA_WORKER__MY_IP
valueFrom:
fieldRef:
Expand Down
Loading