Skip to content

Commit 0312e2f

Browse files
Merge pull request #3463 from abramche/docs/cleanup-old-scylla-refs-docs
docs: clean up remaining <=2024.x references
2 parents dcb3844 + 63069bc commit 0312e2f

3 files changed

Lines changed: 3 additions & 56 deletions

File tree

docs/source/operate/perform-rolling-restart.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,3 @@ In multi-DC clusters using multiple `ScyllaCluster` resources, restart each data
4545

4646
- [StatefulSets and racks](../understand/statefulsets-and-racks.md) — how StatefulSets manage rolling updates with partition-based rollouts
4747
- [Upgrade ScyllaDB](../upgrade/upgrade-scylladb.md) — version upgrades that include an automatic rolling restart
48-
- [Back up and restore](back-up-and-restore.md) — schema restores on older ScyllaDB versions require a rolling restart after the restore completes

docs/source/operate/restore-from-backup.md

Lines changed: 2 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@ Restore from backup taken using [ScyllaDB Manager](../understand/manager.md) to
99
- A backup snapshot stored in object storage (Amazon S3, Google Cloud Storage, or Azure Blob Storage).
1010
- The target cluster has access to the backup bucket (same object storage credentials as the source).
1111

12-
:::{warning}
13-
Restoring schema with **ScyllaDB OS 5.4.X** or **ScyllaDB Enterprise 2024.1.X** and `consistent_cluster_management` isn't supported.
14-
15-
When creating the `target` ScyllaDB cluster, configure it with `consistent_cluster_management: false`.
16-
17-
When following the steps for schema restore, ensure you follow the additional steps dedicated to affected ScyllaDB versions.
18-
:::
19-
2012
In the following example, the ScyllaCluster, which was used to take the backup, is called `source`. Backup will be restored into the ScyllaCluster named `target`.
2113

2214
:::::{tabs}
@@ -131,7 +123,7 @@ Use the following command to check progress of the restore task:
131123
$ kubectl -n scylla-manager exec -ti deployment.apps/scylla-manager -- sctool progress -c scylla/target restore/57228c52-7cf6-4271-8c8d-d446ff160747
132124
Restore progress
133125
Run: 0dd20cdf-abc4-11ee-951c-6e7993cf42ed
134-
Status: DONE - restart required (see restore docs)
126+
Status: DONE
135127
Start time: 05 Jan 24 12:15:02 UTC
136128
End time: 05 Jan 24 12:15:09 UTC
137129
Duration: 6s
@@ -145,50 +137,7 @@ Snapshot Tag: sm_20240105115931UTC
145137
+---------------+-------------+----------+----------+------------+--------+
146138
```
147139

148-
As suggested in the progress output, you will need to execute a rolling restart of the ScyllaCluster **if you are using ScyllaDB 5.4/2024.1 or older**. For ScyllaDB 2024.2 and newer, a rolling restart is not required after restoring the schema.
149-
150-
For more details, refer to the ScyllaDB Manager Restore documentation:
151-
- [Old Restore Schema Documentation](https://manager.docs.scylladb.com/stable/restore/old-restore-schema.html) (for ScyllaDB 5.4/2024.1 or older)
152-
- [New Restore Schema Documentation](https://manager.docs.scylladb.com/stable/restore/restore-schema.html) (for ScyllaDB 2024.2 and newer)
153-
154-
```console
155-
kubectl patch scyllacluster/target --type=merge -p='{"spec": {"forceRedeploymentReason": "schema restored"}}'
156-
```
157-
158-
Use the following commands to wait until restart is finished:
159-
```console
160-
$ kubectl wait --for='condition=Progressing=False' scyllaclusters.scylla.scylladb.com/target
161-
scyllacluster.scylla.scylladb.com/target condition met
162-
163-
$ kubectl wait --for='condition=Degraded=False' scyllaclusters.scylla.scylladb.com/target
164-
scyllacluster.scylla.scylladb.com/target condition met
165-
166-
$ kubectl wait --for='condition=Available=True' scyllaclusters.scylla.scylladb.com/target
167-
scyllacluster.scylla.scylladb.com/target condition met
168-
```
169-
170-
:::{caution}
171-
### Restoring schema with **ScyllaDB OS 5.4.X** or **ScyllaDB Enterprise 2024.1.X** and `consistent_cluster_management`
172-
173-
After you've followed the above steps with a ScyllaDB target cluster with `consistent_cluster_management` disabled, you'll need to enable Raft by configuring the target cluster with `consistent_cluster_management: true`.
174-
175-
You will then need to execute a rolling restart of the ScyllaCluster for the change to take effect.
176-
```console
177-
kubectl patch scyllacluster/target --type=merge -p='{"spec": {"forceRedeploymentReason": "raft enabled"}}'
178-
```
179-
180-
Use the following commands to wait until restart is finished:
181-
```console
182-
$ kubectl wait --for='condition=Progressing=False' scyllaclusters.scylla.scylladb.com/target
183-
scyllacluster.scylla.scylladb.com/target condition met
184-
185-
$ kubectl wait --for='condition=Degraded=False' scyllaclusters.scylla.scylladb.com/target
186-
scyllacluster.scylla.scylladb.com/target condition met
187-
188-
$ kubectl wait --for='condition=Available=True' scyllaclusters.scylla.scylladb.com/target
189-
scyllacluster.scylla.scylladb.com/target condition met
190-
```
191-
:::
140+
For more details, refer to the [ScyllaDB Manager Restore Schema Documentation](https://manager.docs.scylladb.com/stable/restore/restore-schema.html).
192141

193142
## Restore tables
194143

@@ -263,5 +212,4 @@ SELECT COUNT(*) FROM users.users;
263212

264213
- [Back up and restore](back-up-and-restore.md) — overview of backup and restore with ScyllaDB Manager.
265214
- [ScyllaDB Manager](../understand/manager.md) — how Manager integrates with the Operator.
266-
- [Rolling restart](perform-rolling-restart.md) — how to trigger a rolling restart (required after schema restore on older ScyllaDB versions).
267215
- [ScyllaDB Manager Restore Documentation](https://manager.docs.scylladb.com/stable/restore/) — upstream Manager restore reference.

pkg/resource/helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func GetObjectGVKOrUnknown(obj runtime.Object) *schema.GroupVersionKind {
3737
kinds, _, err := Scheme.ObjectKinds(obj)
3838
if err != nil || len(kinds) == 0 {
3939
t := reflect.TypeOf(obj)
40-
if t.Kind() == reflect.Ptr {
40+
if t.Kind() == reflect.Pointer {
4141
t = t.Elem()
4242
}
4343
return &schema.GroupVersionKind{

0 commit comments

Comments
 (0)