Skip to content

Commit 1369ea0

Browse files
authored
Merge pull request #106434 from openshift-cherrypick-robot/cherry-pick-106008-to-enterprise-4.21
[enterprise-4.21] fix callouts and dita errors
2 parents ac3b567 + ab28c19 commit 1369ea0

File tree

4 files changed

+118
-151
lines changed

4 files changed

+118
-151
lines changed

backup_and_restore/application_backup_and_restore/installing/overriding-kopia-algorithms.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include::_attributes/common-attributes.adoc[]
88
toc::[]
99

1010
[role="_abstract"]
11-
You can override the default values of Kopia hashing, encryption, and splitter algorithms by using specific environment variables in the Data Protection Application (DPA).
11+
Override the default values of Kopia hashing, encryption, and splitter algorithms by using specific environment variables in the Data Protection Application (DPA).
1212

1313
// configuring the DPA with Kopia environment variables
1414
include::modules/oadp-kopia-configuring-algorithms.adoc[leveloffset=+1]

modules/oadp-kopia-algorithms-benchmarking.adoc

Lines changed: 42 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,24 @@
77
= Benchmarking Kopia hashing, encryption, and splitter algorithms
88

99
[role="_abstract"]
10-
You can run Kopia commands to benchmark the hashing, encryption, and splitter algorithms. Based on the benchmarking results, you can select the most suitable algorithm for your workload. In this procedure, you run the Kopia benchmarking commands from a pod on the cluster. The benchmarking results can vary depending on CPU speed, available RAM, disk speed, current I/O load, and so on.
10+
Run Kopia commands to benchmark the hashing, encryption, and splitter algorithms. Based on the benchmarking results, you can select the most suitable algorithm for your workload. You run the Kopia benchmarking commands from a pod on the cluster. The benchmarking results can vary depending on CPU speed, available RAM, disk speed, current I/O load, and so on.
11+
12+
include::snippets/kopia-repo-config.adoc[]
1113

1214
.Prerequisites
1315

1416
* You have installed the {oadp-short} Operator.
1517
* You have an application with persistent volumes running in a separate namespace.
1618
* You have run a backup of the application with Container Storage Interface (CSI) snapshots.
1719
18-
include::snippets/kopia-repo-config.adoc[]
20+
1921
2022
.Procedure
2123

2224
. Configure the `must-gather` pod as shown in the following example. Make sure you are using the `oadp-mustgather` image for {oadp-short} version 1.3 and later.
2325
+
2426
.Example pod configuration
25-
+
27+
2628
[source,yaml]
2729
----
2830
apiVersion: v1
@@ -39,19 +41,18 @@ spec:
3941
args: ["infinity"]
4042
----
4143
+
42-
[NOTE]
43-
=====
4444
The Kopia client is available in the `oadp-mustgather` image.
45-
=====
46-
+
45+
46+
4747
. Create the pod by running the following command:
4848
+
4949
[source,terminal]
5050
----
51-
$ oc apply -f <pod_config_file_name> # <1>
51+
$ oc apply -f <pod_config_file_name>
5252
----
53-
<1> Specify the name of the YAML file for the pod configuration.
54-
+
53+
Replace `<pod_config_file_name>` with the name of the YAML file for the pod configuration.
54+
55+
5556
. Verify that the Security Context Constraints (SCC) on the pod is `anyuid`, so that Kopia can connect to the repository.
5657
+
5758
[source,terminal]
@@ -60,43 +61,46 @@ $ oc describe pod/oadp-mustgather-pod | grep scc
6061
----
6162
+
6263
.Example output
63-
+
64+
6465
[source,terminal]
6566
----
6667
openshift.io/scc: anyuid
6768
----
68-
+
69+
6970
. Connect to the pod via SSH by running the following command:
7071
+
7172
[source,terminal]
7273
----
7374
$ oc -n openshift-adp rsh pod/oadp-mustgather-pod
7475
----
75-
+
76+
7677
. Connect to the Kopia repository by running the following command:
7778
+
7879
[source,terminal]
7980
----
8081
sh-5.1# kopia repository connect s3 \
81-
--bucket=<bucket_name> \ # <1>
82-
--prefix=velero/kopia/<application_namespace> \ # <2>
83-
--password=static-passw0rd \ # <3>
84-
--access-key="<access_key>" \ # <4>
85-
--secret-access-key="<secret_access_key>" \ # <5>
86-
--endpoint=<bucket_endpoint> \ # <6>
87-
----
88-
<1> Specify the object storage provider bucket name.
89-
<2> Specify the namespace for the application.
90-
<3> This is the Kopia password to connect to the repository.
91-
<4> Specify the object storage provider access key.
92-
<5> Specify the object storage provider secret access key.
93-
<6> Specify the bucket endpoint. You do not need to specify the bucket endpoint, if you are using {aws-short} S3 as the storage provider.
82+
--bucket=<bucket_name> \
83+
--prefix=velero/kopia/<application_namespace> \
84+
--password=static-passw0rd \
85+
--access-key="<access_key>" \
86+
--secret-access-key="<secret_access_key>" \
87+
--endpoint=<bucket_endpoint>
88+
----
89+
+
90+
where:
91+
+
92+
`<bucket_name>`:: Specifies the object storage provider bucket name.
93+
`<application_namespace>`:: Specifies the namespace for the application.
94+
`static-passw0rd`:: This is the Kopia password to connect to the repository.
95+
`<access_key>`:: Specifies the object storage provider access key.
96+
`<secret_access_key>`:: Specifies the object storage provider secret access key.
97+
`<bucket_endpoint>`:: Specifies the bucket endpoint. You do not need to specify the bucket endpoint, if you are using {aws-short} S3 as the storage provider.
98+
9499
+
95-
[NOTE]
96-
====
100+
97101
This is an example command. The command can vary based on the object storage provider.
98-
====
99-
+
102+
103+
100104
. To benchmark the hashing algorithm, run the following command:
101105
+
102106
[source,terminal]
@@ -109,32 +113,11 @@ sh-5.1# kopia benchmark hashing
109113
----
110114
Benchmarking hash 'BLAKE2B-256' (100 x 1048576 bytes, parallelism 1)
111115
Benchmarking hash 'BLAKE2B-256-128' (100 x 1048576 bytes, parallelism 1)
112-
Benchmarking hash 'BLAKE2S-128' (100 x 1048576 bytes, parallelism 1)
113-
Benchmarking hash 'BLAKE2S-256' (100 x 1048576 bytes, parallelism 1)
114-
Benchmarking hash 'BLAKE3-256' (100 x 1048576 bytes, parallelism 1)
115-
Benchmarking hash 'BLAKE3-256-128' (100 x 1048576 bytes, parallelism 1)
116-
Benchmarking hash 'HMAC-SHA224' (100 x 1048576 bytes, parallelism 1)
117-
Benchmarking hash 'HMAC-SHA256' (100 x 1048576 bytes, parallelism 1)
118-
Benchmarking hash 'HMAC-SHA256-128' (100 x 1048576 bytes, parallelism 1)
119-
Benchmarking hash 'HMAC-SHA3-224' (100 x 1048576 bytes, parallelism 1)
120-
Benchmarking hash 'HMAC-SHA3-256' (100 x 1048576 bytes, parallelism 1)
121-
Hash Throughput
122-
-----------------------------------------------------------------
123-
0. BLAKE3-256 15.3 GB / second
124-
1. BLAKE3-256-128 15.2 GB / second
125-
2. HMAC-SHA256-128 6.4 GB / second
126-
3. HMAC-SHA256 6.4 GB / second
127-
4. HMAC-SHA224 6.4 GB / second
128-
5. BLAKE2B-256-128 4.2 GB / second
129-
6. BLAKE2B-256 4.1 GB / second
130-
7. BLAKE2S-256 2.9 GB / second
131-
8. BLAKE2S-128 2.9 GB / second
132-
9. HMAC-SHA3-224 1.6 GB / second
133-
10. HMAC-SHA3-256 1.5 GB / second
134-
-----------------------------------------------------------------
116+
117+
135118
Fastest option for this machine is: --block-hash=BLAKE3-256
136119
----
137-
+
120+
138121
. To benchmark the encryption algorithm, run the following command:
139122
+
140123
[source,terminal]
@@ -145,16 +128,12 @@ sh-5.1# kopia benchmark encryption
145128
.Example output
146129
[source,terminal]
147130
----
148-
Benchmarking encryption 'AES256-GCM-HMAC-SHA256'... (1000 x 1048576 bytes, parallelism 1)
149-
Benchmarking encryption 'CHACHA20-POLY1305-HMAC-SHA256'... (1000 x 1048576 bytes, parallelism 1)
150-
Encryption Throughput
151-
-----------------------------------------------------------------
152-
0. AES256-GCM-HMAC-SHA256 2.2 GB / second
153-
1. CHACHA20-POLY1305-HMAC-SHA256 1.8 GB / second
154-
-----------------------------------------------------------------
131+
Benchmarking encryption 'AES256-GCM-HMAC-SHA256'
132+
Benchmarking encryption 'CHACHA20-POLY1305-HMAC-SHA256'
133+
155134
Fastest option for this machine is: --encryption=AES256-GCM-HMAC-SHA256
156135
----
157-
+
136+
158137
. To benchmark the splitter algorithm, run the following command:
159138
+
160139
[source,terminal]
@@ -169,13 +148,6 @@ splitting 16 blocks of 32MiB each, parallelism 1
169148
DYNAMIC 747.6 MB/s count:107 min:9467 10th:2277562 25th:2971794 50th:4747177 75th:7603998 90th:8388608 max:8388608
170149
DYNAMIC-128K-BUZHASH 718.5 MB/s count:3183 min:3076 10th:80896 25th:104312 50th:157621 75th:249115 90th:262144 max:262144
171150
DYNAMIC-128K-RABINKARP 164.4 MB/s count:3160 min:9667 10th:80098 25th:106626 50th:162269 75th:250655 90th:262144 max:262144
172-
# ...
173-
FIXED-512K 102.9 TB/s count:1024 min:524288 10th:524288 25th:524288 50th:524288 75th:524288 90th:524288 max:524288
174-
FIXED-8M 566.3 TB/s count:64 min:8388608 10th:8388608 25th:8388608 50th:8388608 75th:8388608 90th:8388608 max:8388608
175-
-----------------------------------------------------------------
176-
0. FIXED-8M 566.3 TB/s count:64 min:8388608 10th:8388608 25th:8388608 50th:8388608 75th:8388608 90th:8388608 max:8388608
177-
1. FIXED-4M 425.8 TB/s count:128 min:4194304 10th:4194304 25th:4194304 50th:4194304 75th:4194304 90th:4194304 max:4194304
178-
# ...
179-
22. DYNAMIC-128K-RABINKARP 164.4 MB/s count:3160 min:9667 10th:80098 25th:106626 50th:162269 75th:250655 90th:262144 max:262144
151+
180152
----
181153

modules/oadp-kopia-configuring-algorithms.adoc

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,51 @@
77
= Configuring the DPA to override Kopia hashing, encryption, and splitter algorithms
88

99
[role="_abstract"]
10-
You can use an {oadp-first} option to override the default Kopia algorithms for hashing, encryption, and splitter to improve Kopia performance or to compare performance metrics. You can set the following environment variables in the `spec.configuration.velero.podConfig.env` section of the DPA:
10+
Configure the Data Protection Application (DPA) to override the default Kopia hashing, encryption, and splitter algorithms by setting environment variables in the Velero pod configuration. This helps you improve Kopia performance and compare performance metrics for your backup operations.
1111

12-
* `KOPIA_HASHING_ALGORITHM`
13-
* `KOPIA_ENCRYPTION_ALGORITHM`
14-
* `KOPIA_SPLITTER_ALGORITHM`
12+
include::snippets/kopia-repo-config.adoc[]
1513

1614
.Prerequisites
1715

1816
* You have installed the {oadp-short} Operator.
1917
* You have created the secret by using the credentials provided by the cloud provider.
2018
21-
include::snippets/kopia-repo-config.adoc[]
22-
2319
.Procedure
2420

2521
* Configure the DPA with the environment variables for hashing, encryption, and splitter as shown in the following example.
22+
2623
+
27-
.Example DPA
24+
2825
[source,yaml]
2926
----
3027
apiVersion: oadp.openshift.io/v1alpha1
3128
kind: DataProtectionApplication
3229
#...
3330
configuration:
3431
nodeAgent:
35-
enable: true # <1>
36-
uploaderType: kopia # <2>
32+
enable: true
33+
uploaderType: kopia
3734
velero:
3835
defaultPlugins:
3936
- openshift
4037
- aws
41-
- csi #<3>
38+
- csi
4239
defaultSnapshotMoveData: true
4340
podConfig:
4441
env:
4542
- name: KOPIA_HASHING_ALGORITHM
46-
value: <hashing_algorithm_name> # <4>
43+
value: <hashing_algorithm_name>
4744
- name: KOPIA_ENCRYPTION_ALGORITHM
48-
value: <encryption_algorithm_name> # <5>
45+
value: <encryption_algorithm_name>
4946
- name: KOPIA_SPLITTER_ALGORITHM
50-
value: <splitter_algorithm_name> # <6>
47+
value: <splitter_algorithm_name>
5148
----
52-
<1> Enable the `nodeAgent`.
53-
<2> Specify the `uploaderType` as `kopia`.
54-
<3> Include the `csi` plugin.
55-
<4> Specify a hashing algorithm. For example, `BLAKE3-256`.
56-
<5> Specify an encryption algorithm. For example, `CHACHA20-POLY1305-HMAC-SHA256`.
57-
<6> Specify a splitter algorithm. For example, `DYNAMIC-8M-RABINKARP`.
49+
+
50+
where:
51+
52+
`enable`:: Set to `true` to enable the `nodeAgent`.
53+
`uploaderType`:: Specifies the uploader type as `kopia`.
54+
`csi`:: Include the `csi` plugin.
55+
`<hashing_algorithm_name>`:: Specifies a hashing algorithm. For example, `BLAKE3-256`.
56+
`<encryption_algorithm_name>`:: Specifies an encryption algorithm. For example, `CHACHA20-POLY1305-HMAC-SHA256`.
57+
`<splitter_algorithm_name>`:: Specifies a splitter algorithm. For example, `DYNAMIC-8M-RABINKARP`.

0 commit comments

Comments
 (0)