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.

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

Default port change from 8080 -> 8181 #403

Merged
merged 2 commits into from
Apr 27, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This starts an instance of the JSON API along with a Stargate coordinator node i
> **Warning**
> Running this script with no options will use the latest `v1` tagged version of JSON API and latest `v2` tagged version of the Stargate coordinator. Therefore, if you have these tags already present in your local Docker from other development/testing, those are the images that will be used. See our Docker compose [README](docker-compose/README.md) to see additional options.

Once the services are up, you can access the Swagger endpoint at: http://localhost:8080/swagger-ui/
Once the services are up, you can access the Swagger endpoint at: http://localhost:8181/swagger-ui/

We also have a Postman collection you can use to learn about the various operations supported by the JSON API as part of the [Stargate-Cassandra](https://www.postman.com/datastax/workspace/stargate-cassandra/overview) workspace.

Expand Down Expand Up @@ -78,7 +78,7 @@ docker run -d --rm -e CLUSTER_NAME=dse-cluster -e CLUSTER_VERSION=6.8 -e ENABLE_

The command above will first spin the single Stargate DSE coordinator in dev that the API would communicate to.

> **_NOTE:_** Quarkus now ships with a Dev UI, which is available in dev mode only at http://localhost:8080/stargate/dev/.
> **_NOTE:_** Quarkus now ships with a Dev UI, which is available in dev mode only at http://localhost:8181/stargate/dev/.

#### Debugging

Expand Down
4 changes: 2 additions & 2 deletions docker-compose/docker-compose-dev-mode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ services:
networks:
- stargate
ports:
- "8080:8080"
- "8181:8181"
mem_limit: 2G
environment:
- QUARKUS_GRPC_CLIENTS_BRIDGE_HOST=coordinator
- QUARKUS_GRPC_CLIENTS_BRIDGE_PORT=8091
- QUARKUS_HTTP_ACCESS_LOG_ENABLED=${REQUESTLOG}
- QUARKUS_LOG_LEVEL=${LOGLEVEL}
healthcheck:
test: curl -f http://localhost:8080/stargate/health || exit 1
test: curl -f http://localhost:8181/stargate/health || exit 1
interval: 5s
timeout: 10s
retries: 10
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,15 @@ services:
networks:
- stargate
ports:
- "8080:8080"
- "8181:8181"
mem_limit: 2G
environment:
- QUARKUS_GRPC_CLIENTS_BRIDGE_HOST=coordinator
- QUARKUS_GRPC_CLIENTS_BRIDGE_PORT=8091
- QUARKUS_HTTP_ACCESS_LOG_ENABLED=${REQUESTLOG}
- QUARKUS_LOG_LEVEL=${LOGLEVEL}
healthcheck:
test: curl -f http://localhost:8080/stargate/health || exit 1
test: curl -f http://localhost:8181/stargate/health || exit 1
interval: 5s
timeout: 10s
retries: 10
Expand Down
2 changes: 1 addition & 1 deletion helm/jsonapi/templates/stargate_docsapi_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
- name: jsonapi
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
ports:
Copy link
Contributor

@tatu-at-datastax tatu-at-datastax Apr 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not changed in this PR but isn't YAML file name misleading wrt docsapi part?
And would it make sense to rename now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make sense, renamed the file names.

- containerPort: 8080
- containerPort: 8181
readinessProbe:
httpGet:
path: {{ .Values.probe.readiness.url }}
Expand Down
2 changes: 1 addition & 1 deletion helm/jsonapi/templates/stargate_docsapi_ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
service:
name: stargate-jsonapi
port:
number: 8080
number: 8181
path: /
pathType: Prefix
{{ end }}
4 changes: 2 additions & 2 deletions helm/jsonapi/templates/stargate_docsapi_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ metadata:
spec:
ports:
- name: stargate-jsonapi
port: 8080
port: 8181
protocol: TCP
targetPort: 8080
targetPort: 8181
selector:
app: stargate-jsonapi
type: ClusterIP
Expand Down
4 changes: 2 additions & 2 deletions helm/jsonapi/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ memory: 2048
probe:
readiness:
url: /stargate/health/ready
port: 8080
port: 8181
timeoutSeconds: 10
periodSeconds: 10
failureThreshold: 30
initialDelaySeconds: 30
liveness:
url: /stargate/health/live
port: 8080
port: 8181
timeoutSeconds: 10
periodSeconds: 10
failureThreshold: 5
Expand Down
16 changes: 8 additions & 8 deletions nosqlbench/http-jsonapi-crud-basic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ min_version: "5.17.1"
description: >2
This workload emulates CRUD operations for the Stargate JSON API.
It generates a simple JSON document to be used for writes and updates.
Note that jsonapi_port should reflect the port where the JSON API is exposed (defaults to 8080).
Note that jsonapi_port should reflect the port where the JSON API is exposed (defaults to 8181).

scenarios:
default:
Expand Down Expand Up @@ -51,7 +51,7 @@ blocks:
ops:
create-namespace:
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand All @@ -66,7 +66,7 @@ blocks:

delete-collection:
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1/<<namespace:jsonapi_crud_basic>>
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1/<<namespace:jsonapi_crud_basic>>
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand All @@ -81,7 +81,7 @@ blocks:

create-collection:
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1/<<namespace:jsonapi_crud_basic>>
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1/<<namespace:jsonapi_crud_basic>>
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand All @@ -100,7 +100,7 @@ blocks:
write-document:
space: "{space}"
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1/<<namespace:jsonapi_crud_basic>>/<<collection:docs_collection>>
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1/<<namespace:jsonapi_crud_basic>>/<<collection:docs_collection>>
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand Down Expand Up @@ -141,7 +141,7 @@ blocks:
read-document:
space: "{space}"
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1/<<namespace:jsonapi_crud_basic>>/<<collection:docs_collection>>
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1/<<namespace:jsonapi_crud_basic>>/<<collection:docs_collection>>
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand All @@ -163,7 +163,7 @@ blocks:
update-document:
space: "{space}"
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1/<<namespace:jsonapi_crud_basic>>/<<collection:docs_collection>>
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1/<<namespace:jsonapi_crud_basic>>/<<collection:docs_collection>>
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand Down Expand Up @@ -211,7 +211,7 @@ blocks:
delete-document:
space: "{space}"
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1/<<namespace:jsonapi_crud_basic>>/<<collection:docs_collection>>
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1/<<namespace:jsonapi_crud_basic>>/<<collection:docs_collection>>
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand Down
14 changes: 7 additions & 7 deletions nosqlbench/http-jsonapi-crud-dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ min_version: "5.17.1"
description: >2
This workload emulates CRUD operations for the Stargate Documents API.
It requires a data set file, where each line is a single JSON document to be used for writes and updates.
Note that jsonapi_port should reflect the port where the Docs API is exposed (defaults to 8080).
Note that jsonapi_port should reflect the port where the Docs API is exposed (defaults to 8181).

scenarios:
default:
Expand Down Expand Up @@ -38,7 +38,7 @@ blocks:
ops:
create-namespace:
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand All @@ -53,7 +53,7 @@ blocks:

delete-collection:
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1/<<namespace:jsonapi_crud_basic>>
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1/<<namespace:jsonapi_crud_basic>>
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand All @@ -68,7 +68,7 @@ blocks:

create-collection:
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1/namespaces/<<namespace:jsonapi_crud_basic>>
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1/namespaces/<<namespace:jsonapi_crud_basic>>
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand Down Expand Up @@ -100,7 +100,7 @@ blocks:
read-document:
space: "{space}"
method: GET
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v2/namespaces/<<namespace:jsonapi_crud_dataset>>/collections/<<table:docs_collection>>/{random_key}
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v2/namespaces/<<namespace:jsonapi_crud_dataset>>/collections/<<table:docs_collection>>/{random_key}
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand All @@ -110,7 +110,7 @@ blocks:
update-document:
space: "{space}"
method: PUT
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v2/namespaces/<<namespace:jsonapi_crud_dataset>>/collections/<<table:docs_collection>>/{random_key}
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v2/namespaces/<<namespace:jsonapi_crud_dataset>>/collections/<<table:docs_collection>>/{random_key}
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand All @@ -120,7 +120,7 @@ blocks:
delete-document:
space: "{space}"
method: DELETE
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v2/namespaces/<<namespace:jsonapi_crud_dataset>>/collections/<<table:docs_collection>>/{seq_key}
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v2/namespaces/<<namespace:jsonapi_crud_dataset>>/collections/<<table:docs_collection>>/{seq_key}
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand Down
14 changes: 7 additions & 7 deletions nosqlbench/http-jsonapi-keyvalue.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >2
- Schema creation with the Docs API, we don't use cql because the Docs API is opinionated about schema.
- There is no instrumentation with the http driver.
- There is no async mode with the http driver.
Note that jsonapi_port should reflect the port where the Docs API is exposed (defaults to 8080).
Note that jsonapi_port should reflect the port where the Docs API is exposed (defaults to 8181).

scenarios:
default:
Expand Down Expand Up @@ -41,7 +41,7 @@ blocks:
ops:
create-namespace:
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand All @@ -56,7 +56,7 @@ blocks:

delete-collection:
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1/<<namespace:jsonapi_keyvalue>>
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1/<<namespace:jsonapi_keyvalue>>
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand All @@ -71,7 +71,7 @@ blocks:

create-collection:
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1/<<namespace:jsonapi_keyvalue>>
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1/<<namespace:jsonapi_keyvalue>>
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand All @@ -89,7 +89,7 @@ blocks:
rampup-insert:
space: "{space}"
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1/<<namespace:jsonapi_keyvalue>>/<<collection:docs_collection>>
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1/<<namespace:jsonapi_keyvalue>>/<<collection:docs_collection>>
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand All @@ -112,7 +112,7 @@ blocks:
main-select:
space: "{space}"
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1/<<namespace:jsonapi_keyvalue>>/<<collection:docs_collection>>
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1/<<namespace:jsonapi_keyvalue>>/<<collection:docs_collection>>
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand All @@ -130,7 +130,7 @@ blocks:
main-write:
space: "{space}"
method: POST
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8080>><<path_prefix:>>/v1/<<namespace:jsonapi_keyvalue>>/<<collection:docs_collection>>
uri: <<protocol:http>>://{weighted_hosts}:<<jsonapi_port:8181>><<path_prefix:>>/v1/<<namespace:jsonapi_keyvalue>>/<<collection:docs_collection>>
Accept: "application/json"
X-Cassandra-Request-Id: "{request_id}"
X-Cassandra-Token: "{token}"
Expand Down
Loading