Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@jak78
jak78 authored Jan 22, 2024
2 parents 22691f3 + f45e6c9 commit a15f3cb
Show file tree
Hide file tree
Showing 6 changed files with 448 additions and 22 deletions.
48 changes: 48 additions & 0 deletions static/reference/next/pulsar-admin/namespaces.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2304,3 +2304,51 @@ $ pulsar-admin namespaces update-migration-state options
|---|---|---|
| `--migrated` | Is namespace migrated|false||


## set-dispatcher-pause-on-ack-state-persistent

Enable dispatcherPauseOnAckStatePersistent for a namespace

**Command:**

```shell
$ pulsar-admin namespaces set-dispatcher-pause-on-ack-state-persistent options
```

**Options:**

|Flag|Description|Default|
|---|---|---|


## get-dispatcher-pause-on-ack-state-persistent

Get the dispatcherPauseOnAckStatePersistent for a namespace

**Command:**

```shell
$ pulsar-admin namespaces get-dispatcher-pause-on-ack-state-persistent options
```

**Options:**

|Flag|Description|Default|
|---|---|---|


## remove-dispatcher-pause-on-ack-state-persistent

Remove dispatcherPauseOnAckStatePersistent for a namespace

**Command:**

```shell
$ pulsar-admin namespaces remove-dispatcher-pause-on-ack-state-persistent options
```

**Options:**

|Flag|Description|Default|
|---|---|---|

18 changes: 18 additions & 0 deletions static/reference/next/pulsar-admin/transactions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,3 +247,21 @@ $ pulsar-admin transactions coordinators-list options
|Flag|Description|Default|
|---|---|---|


## abort-transaction

Abort transaction

**Command:**

```shell
$ pulsar-admin transactions abort-transaction options
```

**Options:**

|Flag|Description|Default|
|---|---|---|
| `-l, --least-sig-bits` | The least sig bits|0||
| `-m, --most-sig-bits` | The most sig bits|0||

145 changes: 134 additions & 11 deletions static/swagger/master/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,9 @@
},
"BrokerInfo": {
"properties": {
"brokerId": {
"type": "string"
},
"serviceUrl": {
"type": "string"
}
Expand Down Expand Up @@ -1342,22 +1345,23 @@
"format": "int64",
"type": "integer"
},
"isOffloaded": {
"type": "boolean"
},
"ledgerId": {
"format": "int64",
"type": "integer"
},
"metadata": {
"offloadedContextUuid": {
"type": "string"
},
"offloaded": {
"type": "boolean"
},
"size": {
"format": "int64",
"type": "integer"
},
"underReplicated": {
"type": "boolean"
"timestamp": {
"format": "int64",
"type": "integer"
}
},
"type": "object"
Expand Down Expand Up @@ -3119,6 +3123,9 @@
"deleted": {
"type": "boolean"
},
"dispatcherPauseOnAckStatePersistentEnabled": {
"type": "boolean"
},
"encryption_required": {
"type": "boolean"
},
Expand Down Expand Up @@ -5042,7 +5049,7 @@
"description": "This operation requires super-user access"
}
},
"summary": "Get the list of active brokers (web service addresses) in the local cluster.If authorization is not enabled",
"summary": "Get the list of active brokers (broker ids) in the local cluster.If authorization is not enabled",
"tags": [
"brokers"
]
Expand Down Expand Up @@ -5390,7 +5397,7 @@
]
}
},
"/brokers/{clusterName}/{broker-webserviceurl}/ownedNamespaces": {
"/brokers/{clusterName}/{brokerId}/ownedNamespaces": {
"get": {
"description": "",
"operationId": "BrokersBase_getOwnedNamespaces",
Expand All @@ -5403,7 +5410,7 @@
},
{
"in": "path",
"name": "broker-webserviceurl",
"name": "brokerId",
"required": true,
"type": "string"
}
Expand Down Expand Up @@ -5431,7 +5438,7 @@
"description": "Cluster doesn't exist"
}
},
"summary": "Get the list of namespaces served by the specific broker",
"summary": "Get the list of namespaces served by the specific broker id",
"tags": [
"brokers"
]
Expand Down Expand Up @@ -5476,7 +5483,7 @@
"description": "Cluster does not exist: cluster={clustername}"
}
},
"summary": "Get the list of active brokers (web service addresses) in the cluster.If authorization is not enabled, any cluster name is valid.",
"summary": "Get the list of active brokers (broker ids) in the cluster.If authorization is not enabled, any cluster name is valid.",
"tags": [
"brokers"
]
Expand Down Expand Up @@ -7910,6 +7917,122 @@
]
}
},
"/namespaces/{tenant}/{namespace}/dispatcherPauseOnAckStatePersistent": {
"delete": {
"consumes": [
"application/json"
],
"description": "",
"operationId": "Namespaces_removeDispatcherPauseOnAckStatePersistent",
"parameters": [
{
"in": "path",
"name": "tenant",
"required": true,
"type": "string"
},
{
"in": "path",
"name": "namespace",
"required": true,
"type": "string"
}
],
"produces": [
"application/json"
],
"responses": {
"403": {
"description": "Don't have admin permission"
},
"404": {
"description": "Tenant or cluster or namespace doesn't exist"
},
"409": {
"description": "Concurrent modification"
}
},
"summary": "Remove dispatcher pause on ack state persistent configuration for specified namespace.",
"tags": [
"namespaces"
]
},
"get": {
"consumes": [
"application/json"
],
"description": "",
"operationId": "Namespaces_getDispatcherPauseOnAckStatePersistent",
"parameters": [
{
"in": "path",
"name": "tenant",
"required": true,
"type": "string"
},
{
"in": "path",
"name": "namespace",
"required": true,
"type": "string"
}
],
"produces": [
"application/json"
],
"responses": {
"403": {
"description": "Don't have admin permission"
},
"404": {
"description": "Tenant or cluster or namespace doesn't exist"
}
},
"summary": "Get dispatcher pause on ack state persistent config on a namespace.",
"tags": [
"namespaces"
]
},
"post": {
"consumes": [
"application/json"
],
"description": "",
"operationId": "Namespaces_setDispatcherPauseOnAckStatePersistent",
"parameters": [
{
"in": "path",
"name": "tenant",
"required": true,
"type": "string"
},
{
"in": "path",
"name": "namespace",
"required": true,
"type": "string"
}
],
"produces": [
"application/json"
],
"responses": {
"403": {
"description": "Don't have admin permission"
},
"404": {
"description": "Tenant or cluster or namespace doesn't exist"
},
"409": {
"description": "Concurrent modification"
}
},
"summary": "Set dispatcher pause on ack state persistent configuration for specified namespace.",
"tags": [
"namespaces"
]
}
},
"/namespaces/{tenant}/{namespace}/encryptionRequired": {
"get": {
"consumes": [
Expand Down
57 changes: 57 additions & 0 deletions static/swagger/master/swaggertransactions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,63 @@
"version": "v3"
},
"paths": {
"/transactions/abortTransaction/{mostSigBits}/{leastSigBits}": {
"post": {
"consumes": [
"application/json"
],
"description": "",
"operationId": "Transactions_abortTransaction",
"parameters": [
{
"default": false,
"in": "query",
"name": "authoritative",
"required": false,
"type": "boolean"
},
{
"in": "path",
"name": "mostSigBits",
"required": true,
"type": "string"
},
{
"in": "path",
"name": "leastSigBits",
"required": true,
"type": "string"
}
],
"produces": [
"application/json"
],
"responses": {
"307": {
"description": "Topic is not owned by this broker!"
},
"400": {
"description": "Topic is not a persistent topic!"
},
"401": {
"description": "This operation requires super-user access"
},
"404": {
"description": "Tenant or cluster or namespace or topic or coordinator or transaction doesn't exist"
},
"409": {
"description": "Concurrent modification"
},
"503": {
"description": "This Broker is not configured with transactionCoordinatorEnabled=true."
}
},
"summary": "Abort transaction",
"tags": [
"transactions"
]
}
},
"/transactions/coordinatorInternalStats/{coordinatorId}": {
"get": {
"consumes": [
Expand Down
Loading

0 comments on commit a15f3cb

Please sign in to comment.