Skip to content

Commit be487e0

Browse files
authored
DOC-5674, DOC-5889, DOC-5852 Asciidoc syntax cleanup (#254)
* monitoring-docs xrefs * doc-5852 * misc syntax edits
1 parent d78be67 commit be487e0

8 files changed

Lines changed: 269 additions & 236 deletions

File tree

docs/modules/ROOT/pages/backfill-cli.adoc

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Run as a `pulsar-admin` extension::
5050
The `pulsar-admin` extension is packaged with the IBM Elite Support for {pulsar} (formerly {company} Luna Streaming) distribution in the /cliextensions folder, so you don't need to build from source unless you want to make changes to the code.
5151
+
5252
.. Move the generated NAR archive to the /cliextensions folder of your {pulsar-short} installation (e.g. /pulsar/cliextensions).
53-
..Modify the client.conf file of your {pulsar-short} installation to include: `customCommandFactories=cassandra-cdc`.
53+
.. Modify the client.conf file of your {pulsar-short} installation to include: `customCommandFactories=cassandra-cdc`.
5454
.. Run the following command (this assumes the xref:6.9@dse:installing:tarball-dse.adoc[default tarball installation of {dse-short}]):
5555
+
5656
[source,shell]
@@ -264,86 +264,86 @@ In both the `pulsar-admin` extension and the standalone Java application, {cass-
264264
|Parameter
265265
|Description
266266

267-
|--data-dir=PATH
267+
|`--data-dir=PATH`
268268
|The directory where data is exported to and imported from. The
269269
default is a 'data' subdirectory in the current working directory.
270270
The data directory is created if it doesn't exist. Tables are exported in subdirectories of the data directory specified here;
271271
there is one subdirectory per keyspace inside the data
272272
directory, then one subdirectory per table inside each keyspace
273273
directory.
274274

275-
|--help, -h
275+
|`--help`, `-h`
276276
|Displays this help message
277277

278-
|--dsbulk-log-dir=PATH, -l
278+
|`--dsbulk-log-dir=PATH`, `-l`
279279
|The directory where {dsbulk-short} should store its logs. The default is a
280280
'logs' subdirectory in the current working directory. This
281281
subdirectory is created if it doesn't exist. Each {dsbulk-short}
282282
operation creates a subdirectory inside the log directory
283283
specified here. This command isn't available in the `pulsar-admin` extension.
284284

285-
|--export-bundle=PATH
285+
|`--export-bundle=PATH`
286286
|The path to a {scb} to connect to an {astra-db} database. Options --export-host and --export-bundle are mutually exclusive.
287287

288-
|--export-consistency=CONSISTENCY
288+
|`--export-consistency=CONSISTENCY`
289289
|The consistency level to use when exporting data. The default is
290290
LOCAL_QUORUM.
291291

292-
|--export-max-concurrent-files=NUM\|AUTO
292+
|`--export-max-concurrent-files=NUM|AUTO`
293293
|The maximum number of concurrent files to write to. Must be a positive
294294
number or the special value AUTO. The default is AUTO.
295295

296-
|--export-max-concurrent-queries=NUM\|AUTO
296+
|`--export-max-concurrent-queries=NUM|AUTO`
297297
|The maximum number of concurrent queries to execute. Must be a
298298
positive number or the special value AUTO. The default is AUTO.
299299

300-
|--export-splits=NUM\|NC
300+
|`--export-splits=NUM|NC`
301301
|The maximum number of token range queries to generate. Use the NC
302302
syntax to specify a multiple of the number of available cores, e.g.
303303
8C = 8 times the number of available cores. The default is 8C. This
304304
is an advanced setting; you should rarely need to modify the default
305305
value.
306306

307-
|--export-dsbulk-option=OPT=VALUE
307+
|`--export-dsbulk-option=OPT=VALUE`
308308
|An extra {dsbulk-short} option to use when exporting. Any valid {dsbulk-short} option
309309
can be specified here, and it is passed as-is to the {dsbulk-short}
310310
process. {dsbulk-short} options, including driver options, must be passed as
311311
'--long.option.name=<value>'. Short options aren't supported.
312312

313-
|--export-host=HOST[:PORT]
313+
|`--export-host=HOST[:PORT]`
314314
|The host name or IP and, optionally, the port of a node from the
315315
{cass-short} cluster. If the port isn't specified, it defaults to
316316
9042. This option can be specified multiple times. Options
317317
--export-host and --export-bundle are mutually exclusive.
318318

319-
|--export-password
319+
|`--export-password`
320320
|The password to use to authenticate against the origin cluster.
321321
Options --export-username and --export-password must be provided
322322
together, or not at all. Omit the parameter value to be prompted for
323323
the password interactively.
324324

325-
|--export-protocol-version=VERSION
325+
|`--export-protocol-version=VERSION`
326326
|The protocol version to use to connect to the {cass-short} cluster, e.g.
327327
'V4'. If not specified, the driver negotiates the highest
328328
version supported by both the client and the server.
329329

330-
|--export-username=STRING
330+
|`--export-username=STRING`
331331
|The username to use to authenticate against the origin cluster.
332332
Options --export-username and --export-password must be provided
333333
together, or not at all.
334334

335-
|--keyspace=<keyspace>, -k
335+
|`--keyspace=<keyspace>`, `-k`
336336
|The name of the keyspace where the table to be exported exists
337337

338-
|--max-rows-per-second=PATH
338+
|`--max-rows-per-second=PATH`
339339
|The maximum number of rows per second to read from the {cass-short}
340340
table. Setting this option to any negative value or zero
341341
disables it. The default is -1.
342342

343-
|--table=<table>, -t
343+
|`--table=<table>`, `-t`
344344
|The name of the table to export data from for cdc back filling
345345

346-
|--version, -v
346+
|`--version`, `-v`
347347
|Displays version info.
348348
|===
349349

@@ -357,52 +357,52 @@ These parameters should be passed as command line arguments in the standalone Ja
357357
|===
358358
|Parameter |Description
359359

360-
|--events-topic-prefix=<topicPrefix>
360+
|`--events-topic-prefix=<topicPrefix>`
361361
|The event topic name prefix. The `<keyspace_name>.<table_name>` is appended to that prefix to build the topic name.
362362

363-
|--pulsar-auth-params=<pulsarAuthParams>
363+
|`--pulsar-auth-params=<pulsarAuthParams>`
364364
|The {pulsar-short} authentication parameters.
365365

366-
|--pulsar-auth-plugin-class-name=<pulsarAuthPluginClassName>
366+
|`--pulsar-auth-plugin-class-name=<pulsarAuthPluginClassName>`
367367
|The {pulsar-short} authentication plugin class name.
368368

369-
|--pulsar-url=<pulsarServiceUrl>
369+
|`--pulsar-url=<pulsarServiceUrl>`
370370
|The {pulsar-short} broker service URL.
371371

372-
|--pulsar-ssl-provider=<sslProvider>
372+
|`--pulsar-ssl-provider=<sslProvider>`
373373
|The SSL/TLS provider to use.
374374

375-
|--pulsar-ssl-truststore-path=<sslTruststorePath>
375+
|`--pulsar-ssl-truststore-path=<sslTruststorePath>`
376376
|The path to the SSL/TLS truststore file.
377377

378-
|--pulsar-ssl-truststore-password=<sslTruststorePassword>
378+
|`--pulsar-ssl-truststore-password=<sslTruststorePassword>`
379379
|The password for the SSL/TLS truststore.
380380

381-
|--pulsar-ssl-truststore-type=<sslTruststoreType>
381+
|`--pulsar-ssl-truststore-type=<sslTruststoreType>`
382382
|The type of the SSL/TLS truststore.
383383

384-
|--pulsar-ssl-keystore-path=<sslKeystorePath>
384+
|`--pulsar-ssl-keystore-path=<sslKeystorePath>`
385385
|The path to the SSL/TLS keystore file.
386386

387-
|--pulsar-ssl-keystore-password=<sslKeystorePassword>
387+
|`--pulsar-ssl-keystore-password=<sslKeystorePassword>`
388388
|The password for the SSL/TLS keystore.
389389

390-
|--pulsar-ssl-cipher-suites=<sslCipherSuites>
390+
|`--pulsar-ssl-cipher-suites=<sslCipherSuites>`
391391
|Defines one or more cipher suites to use for negotiating the SSL/TLS connection.
392392

393-
|--pulsar-ssl-enabled-protocols=<sslEnabledProtocols>
393+
|`--pulsar-ssl-enabled-protocols=<sslEnabledProtocols>`
394394
|Enabled SSL/TLS protocols
395395

396-
|--pulsar-ssl-allow-insecure-connections
396+
|`--pulsar-ssl-allow-insecure-connections`
397397
|Allows insecure connections to servers whose certificate hasn't been signed by an approved CA.
398-
Always disable `sslAllowInsecureConnection` in production environments.
398+
Always disable `--pulsar-ssl-allow-insecure-connections` in production environments.
399399

400-
|--pulsar-ssl-enable-hostname-verification
400+
|`--pulsar-ssl-enable-hostname-verification`
401401
|Enable the server hostname verification.
402402

403-
|--pulsar-ssl-tls-trust-certs-path=<tlsTrustCertsFilePath>
403+
|`--pulsar-ssl-tls-trust-certs-path=<tlsTrustCertsFilePath>`
404404
|The path to the trusted TLS certificate file.
405405

406-
|--pulsar-ssl-use-key-store-tls
406+
|`--pulsar-ssl-use-key-store-tls`
407407
|If TLS is enabled, specifies whether to use KeyStore type as TLS configuration parameter.
408408
|===

docs/modules/ROOT/pages/cdc-cassandra-events.adoc

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The {product} agent pushes the mutation primary key for the CDC-enabled table in
77
88
In order to support https://pulsar.apache.org/docs/en/concepts-topic-compaction/[{pulsar-short} Topic Compaction], the message key is encoded separately from the message payload, in the message metadata.
99

10-
Finally, the following CQL data types are encoded as AVRO logical types:
10+
The following CQL data types are encoded as https://avro.apache.org/docs/current/spec.html#Logical+Types[AVRO logical types]:
1111

1212
* `Date`
1313
* `Decimal`
@@ -16,15 +16,13 @@ Finally, the following CQL data types are encoded as AVRO logical types:
1616
* `Varint`
1717
* `Uuid`, `timeuuid`
1818
19-
See https://avro.apache.org/docs/current/spec.html#Logical+Types[AVRO Logical Types] for more info on AVRO.
20-
2119
== Change Event's Key
2220

2321
For a given table, the change event's key is an AVRO record that contains a field for each column in the primary key of the table at the time the event was created. Both the events and the data topics (also called the dirty and the clean topics) have the same message key, an AVRO record including the primary key columns.
2422

2523
== `INSERT` Event
2624

27-
Let's create a {cass-short} table to illustrate what happens:
25+
Create a {cass-short} table to test this behavior:
2826

2927
[source,bash]
3028
----
@@ -49,7 +47,7 @@ CREATE TABLE ks1.tbl1 (
4947
AND speculative_retry = '99PERCENTILE';
5048
----
5149

52-
Then insert a row:
50+
Insert a row:
5351

5452
[source,bash]
5553
----
@@ -89,6 +87,10 @@ You can check the connector status with the following command. The connector mus
8987
[source,bash]
9088
----
9189
bin/pulsar-admin source status --name cassandra-source-ks1-table1
90+
----
91+
92+
[source,json]
93+
----
9294
{
9395
"numInstances" : 1,
9496
"numRunning" : 1,
@@ -115,22 +117,24 @@ bin/pulsar-admin source status --name cassandra-source-ks1-table1
115117

116118
If you're having issues consuming CDC events, check the source connector logs on your {pulsar-short} function workers and the data topic schema.
117119

118-
=== Check the source connector logs
119-
120+
Check the source connector logs::
120121
Check the source connector logs on your {pulsar-short} function workers. The name of the logs depends on the connectors' name.
121-
122+
+
122123
[source,bash]
123124
----
124125
cat logs/functions/public/default/cassandra-source-ks1-table1/cassandra-source-ks1-table1-0.log
125126
----
126127

127-
=== Check the data topic schema
128-
128+
Check the data topic schema::
129129
Check the https://pulsar.apache.org/docs/en/schema-manage/[{pulsar-short} schema] to ensure the clean topic matches your CQL table:
130-
130+
+
131131
[source,bash]
132132
----
133133
bin/pulsar-admin schemas get "persistent://public/default/data-ks1.table1"
134+
----
135+
+
136+
[source,json]
137+
----
134138
{
135139
"version": 0,
136140
"schemaInfo": {
@@ -188,8 +192,6 @@ bin/pulsar-admin schemas get "persistent://public/default/data-ks1.table1"
188192
}
189193
----
190194

191-
== What's next?
192-
193-
For more on change data capture, see xref:cdcExample.adoc[].
194-
195+
== See also
195196

197+
* xref:ROOT:cdcExample.adoc[]

docs/modules/ROOT/pages/cdcExample.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,4 +229,4 @@ Any captured CDC events from your database table should be reflected in the comm
229229

230230
== See also
231231

232-
* xref:monitor.adoc[]
232+
* xref:ROOT:monitor.adoc[]

docs/modules/ROOT/pages/faqs.adoc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ From there, the data can be published to external platforms like Elasticsearch,
2323

2424
== How do I install {product-short}?
2525

26-
Follow the xref:install.adoc[installation instructions].
26+
Follow the xref:ROOT:install.adoc[installation instructions].
2727

2828
== What are the requirements for {product-short}?
2929

@@ -65,7 +65,7 @@ If the {pulsar-short} cluster is down, the change agent continues trying to send
6565
When the disk space of the `cdc_raw` directory reaches your `cdc_total_space_in_mb` {cass-short} setting (less than 4 GB by default), writes to CDC-enabled tables fail with a `CDCWriteException`.
6666
The following warning message is included in {cass-short} logs:
6767

68-
[source,bash]
68+
[source,console]
6969
----
7070
WARN [CoreThread-5] 2021-10-29 09:12:52,790 NoSpamLogger.java:98 - Rejecting Mutation containing CDC-enabled table. Free up space in /mnt/data/cdc_raw.
7171
----
@@ -93,7 +93,7 @@ SELECT * FROM system_distributed.cdc_local WHERE keyspace_name = 'keyspace_name'
9393

9494
There are three possible statuses:
9595

96-
Enabled::
96+
`enabled`::
9797
If the CDC status is `enabled`, then CDC is enabled on the table.
9898
+
9999
From this status, you can disable CDC on the table by running the following CQL query:
@@ -103,7 +103,7 @@ From this status, you can disable CDC on the table by running the following CQL
103103
ALTER TABLE keyspace_name.table_name WITH cdc = {'enabled': false};
104104
----
105105

106-
Disabled::
106+
`disabled`::
107107
If the CDC status is `disabled` then CDC is disabled on the table.
108108
+
109109
From this status, you can enable CDC on the table by running the following CQL query:
@@ -113,7 +113,7 @@ From this status, you can enable CDC on the table by running the following CQL q
113113
ALTER TABLE keyspace_name.table_name WITH cdc = {'enabled': true};
114114
----
115115

116-
Null::
116+
`null`::
117117
If the CDC status is `null` then CDC isn't enabled on the table.
118118
+
119119
From this status, you can enable CDC on the table by running the following CQL query:
@@ -134,7 +134,7 @@ SELECT * FROM system_distributed.cdc_local WHERE keyspace_name = 'cdc' AND table
134134

135135
There are three possible statuses:
136136

137-
Running::
137+
`running`::
138138
If the `status` column is `running`, then the agent is running.
139139
+
140140
From this status, you can stop the agent by running the following CQL query:
@@ -144,7 +144,7 @@ From this status, you can stop the agent by running the following CQL query:
144144
ALTER TABLE cdc.raw_cdc WITH cdc = {'enabled': false};
145145
----
146146

147-
Stopped::
147+
`stopped`::
148148
If the `status` column is `stopped` then the agent isn't running.
149149
+
150150
From this status, you can start the agent by running the following CQL query:
@@ -154,7 +154,7 @@ From this status, you can start the agent by running the following CQL query:
154154
ALTER TABLE cdc.raw_cdc WITH cdc = {'enabled': true};
155155
----
156156

157-
Null::
157+
`null`::
158158
If the `status` column is `null`, then the agent isn't running.
159159
+
160160
From this status, you can start the agent by running the following CQL query:
@@ -179,7 +179,7 @@ The design of CDC in {cass-short} assumed that when table changes are synchroniz
179179
There is a max log size setting that disables writes to the table when the set threshold is reached.
180180
If a connection to the {pulsar-short} cluster is needed for the log to be drained, and it isn't responsive, then the log begins to fill, which can impact a table's write availability.
181181

182-
For more, see the xref:cdc-for-cassandra:ROOT:install.adoc#scaling-up-your-configuration[Scaling up your CDC configuration].
182+
For more, see the xref:ROOT:install.adoc#scaling-up-your-configuration[Scaling up your CDC configuration].
183183

184184
== Does the {csc_pulsar_first} use a dead-letter topic?
185185

@@ -227,11 +227,11 @@ The most manageable way to handle this is to use the {pulsar-short} {cass-short}
227227

228228
The {cass-short} sink requires the following provisions:
229229

230-
- Use the CDC data topic as its source of messages
231-
- Provide a secure bundle (creds) to another {cass-short} cluster
232-
- Map message values to a specific table in the other cluster
233-
- Use the {pulsar-short} delivery guarantee to ensure success
234-
- Use the {pulsar-short} connector health metrics to monitor failures
230+
* Use the CDC data topic as its source of messages
231+
* Provide a secure bundle (creds) to another {cass-short} cluster
232+
* Map message values to a specific table in the other cluster
233+
* Use the {pulsar-short} delivery guarantee to ensure success
234+
* Use the {pulsar-short} connector health metrics to monitor failures
235235

236236
== How do I migrate table data using CDC?
237237

0 commit comments

Comments
 (0)