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

trx-id -> trx_id #1320

Open
wants to merge 7 commits into
base: 8.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
3 changes: 2 additions & 1 deletion doc/source/howtos/garbd_howto.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ When starting from the shell, you can set the parameters from the command line o
--option="socket.ssl_key=/etc/ssl/mysql/server-key.pem; \
socket.ssl_cert=/etc/ssl/mysql/server-cert.pem; \
socket.ssl_ca=/etc/ssl/mysql/ca.pem; \
socket.ssl_cipher=AES128-SHA256"
socket.ssl_cipher=AES128-SHA256; \
socket.ssl=yes"
Copy link
Contributor

Choose a reason for hiding this comment

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

After fixing PXC-3918, explicit addition of socket.ssl option is not needed.


To avoid entering the options each time you start ``garbd``, edit the options in the configuration file. To configure *Galera Arbitrator* on *Ubuntu/Debian*, edit the :file:`/etc/default/garb` file. On RedHat or derivative distributions, the configuration can be found in :file:`/etc/sysconfig/garb` file.
Copy link
Contributor

Choose a reason for hiding this comment

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

You can enter options each time you start garbd or you can edit the options in the garb configuration file. The file is located in the following directories:

  • On Ubuntu/Debian distributions, the configuration file is located in /etc/default/garb
  • On RedHat or derivative distributions, the configuration file is located in /etc/sysconfig/garb.


Expand Down
6 changes: 3 additions & 3 deletions doc/source/manual/certification.rst
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ The following happens if two nodes get ready with their packet at same time:
* Node 1: ``update i = i + 10;``
* Node 2: ``update i = i + 100;``

Let's associate transaction ID (``trx-id``) for an update transaction
Let's associate transaction ID (``trx_id``) for an update transaction
that is executed on Node 1 and Node 2 in parallel.
Although the real algorithm is more involved (with ``uuid`` + ``seqno``),
it is conceptually the same, so we are using ``trx_id``.

* Node 1: ``update action: trx-id=n1x``
* Node 2: ``update action: trx-id=n2x``
* Node 1: ``update action: trx_id=n1x``
* Node 2: ``update action: trx_id=n2x``

Both node packets are added to the channel,
but the transactions are conflicting.
Expand Down