TrueCloudLab/frostfs-node
21
1
Fork 27
Code Issues 108 Pull requests 3 Projects Releases 1 Activity Actions

Change mode of shard components #1121

Merged
fyrchik merged 3 commits from achuprov/frostfs-node:feat/change_mode_shard_components into master 2024-06-05 05:55:27 +00:00
Conversation 4 Commits 3 Files changed 48 +215 -114
achuprov commented 2024-05-06 22:38:29 +00:00
Member
Copy link

Close: #1076
Before:

Shard Mode Metabase Mode Blobstore Mode Writecache Mode Pilorama Mode Blobovnicza Tree Mode FSTree Mode
Read-Only READ_ONLY READ_ONLY READ_ONLY READ_ONLY READ_ONLY READ_ONLY
Read-Write READ_WRITE READ_WRITE READ_WRITE READ_WRITE READ_WRITE READ_WRITE
Degraded-Read-Write DEGRADED_READ_WRITE READ_WRITE DEGRADED_READ_WRITE DEGRADED_READ_WRITE READ_WRITE READ_WRITE
Degraded-Read-Only DEGRADED_READ_ONLY READ_ONLY DEGRADED_READ_ONLY DEGRADED_READ_ONLY READ_ONLY READ_ONLY

After:

Shard Mode Metabase Mode Blobstore Mode Writecache Mode Pilorama Mode Blobovnicza Tree Mode FSTree Mode
Read-Only READ_ONLY READ_ONLY READ_ONLY READ_ONLY READ_ONLY READ_ONLY
Read-Write READ_WRITE READ_WRITE READ_WRITE READ_WRITE READ_WRITE READ_WRITE
Degraded-Read-Write CLOSED READ_WRITE CLOSED CLOSED READ_WRITE READ_WRITE
Degraded-Read-Only CLOSED READ_ONLY CLOSED CLOSED READ_ONLY READ_ONLY
Close: #1076 Before: | Shard Mode | Metabase Mode | Blobstore Mode | Writecache Mode | Pilorama Mode | Blobovnicza Tree Mode | FSTree Mode | |----------------------|----------------------|------------------|----------------------|----------------------|-----------------------|-------------| | `Read-Only` | READ_ONLY | READ_ONLY | READ_ONLY | READ_ONLY | READ_ONLY | READ_ONLY | | `Read-Write` | READ_WRITE | READ_WRITE | READ_WRITE | READ_WRITE | READ_WRITE | READ_WRITE | |` Degraded-Read-Write ` | DEGRADED_READ_WRITE | READ_WRITE | DEGRADED_READ_WRITE | DEGRADED_READ_WRITE | READ_WRITE | READ_WRITE | | `Degraded-Read-Only ` | DEGRADED_READ_ONLY | READ_ONLY | DEGRADED_READ_ONLY | DEGRADED_READ_ONLY | READ_ONLY | READ_ONLY | After: | Shard Mode | Metabase Mode | Blobstore Mode | Writecache Mode | Pilorama Mode | Blobovnicza Tree Mode | FSTree Mode | |----------------------|---------------|----------------|---------------------|---------------|-----------------------|-------------| | `Read-Only` | READ_ONLY | READ_ONLY | READ_ONLY | READ_ONLY | READ_ONLY | READ_ONLY | | `Read-Write` | READ_WRITE | READ_WRITE | READ_WRITE | READ_WRITE | READ_WRITE | READ_WRITE | | `Degraded-Read-Write`| CLOSED | READ_WRITE | CLOSED | CLOSED | READ_WRITE | READ_WRITE | | `Degraded-Read-Only` | CLOSED | READ_ONLY | CLOSED | CLOSED | READ_ONLY | READ_ONLY |
1076.txt
582 B
dstepanov-yadro commented 2024-05-07 06:14:24 +00:00
Member
Copy link

@achuprov why shard mode Degraded-Read-Only does match DEGRADED_READ_ONLY for writecache? Also why Degraded-Read-Write for shard does match DEGRADED for writecache?

@achuprov why shard mode `Degraded-Read-Only` does match `DEGRADED_READ_ONLY` for writecache? Also why `Degraded-Read-Write` for shard does match `DEGRADED` for writecache?
👍 1
achuprov force-pushed feat/change_mode_shard_components from 59a2a606e2 to f4b8d4e7e6 2024-05-07 14:58:23 +00:00 Compare
achuprov force-pushed feat/change_mode_shard_components from f4b8d4e7e6 to 9984a67c94 2024-05-07 15:02:47 +00:00 Compare
achuprov force-pushed feat/change_mode_shard_components from 9984a67c94 to e5f7261b38 2024-05-07 15:49:13 +00:00 Compare
achuprov changed title from WIP: feat/change_mode_shard_components to feat/change_mode_shard_components 2024-05-07 15:56:59 +00:00
achuprov changed title from feat/change_mode_shard_components to Change mode shard components 2024-05-07 15:57:30 +00:00
achuprov requested review from storage-core-committers 2024-05-07 16:16:34 +00:00
achuprov requested review from storage-core-developers 2024-05-07 16:16:34 +00:00
achuprov changed title from Change mode shard components to Change mode of shard components 2024-05-07 16:24:31 +00:00
fyrchik reviewed 2024-05-08 07:38:05 +00:00
docs/shard-modes.md Outdated
@ -18,0 +22,4 @@
|-----------------------|---------------|----------------|-----------------|---------------|-----------------------|-------------|
| `Read-Only` | READ_ONLY | READ_ONLY | READ_ONLY | READ_ONLY | READ_ONLY | READ_ONLY |
| `Read-Write` | READ_WRITE | READ_WRITE | READ_WRITE | READ_WRITE | READ_WRITE | READ_WRITE |
| `Degraded-Read-Write` | CLOSED | READ_WRITE | CLOSED | READ_WRITE | READ_WRITE | READ_WRITE |
fyrchik commented 2024-05-08 07:38:04 +00:00
Owner
Copy link

Pilorama is also closed in degraded modes.

Pilorama is also closed in degraded modes.
achuprov commented 2024-05-13 20:28:19 +00:00
Author
Member
Copy link

Fixed

Fixed
fyrchik reviewed 2024-05-08 07:38:09 +00:00
dstepanov-yadro reviewed 2024-05-08 08:51:11 +00:00
cmd/frostfs-node/config/engine/shard/config.go Outdated
@ -162,3 +162,3 @@
switch s {
case "read-write", "":
m = mode.ReadWrite
m = mode.Mode(mode.ReadWrite)
dstepanov-yadro commented 2024-05-08 08:46:13 +00:00
Member
Copy link

Looks complex. I think it is better to use consts. Or something like func ComponentModeFromShardMode().

Looks complex. I think it is better to use consts. Or something like `func ComponentModeFromShardMode()`.
👍 1
achuprov commented 2024-05-13 20:28:59 +00:00
Author
Member
Copy link

Fixed

Fixed
dstepanov-yadro marked this conversation as resolved
achuprov force-pushed feat/change_mode_shard_components from e5f7261b38 to 0cebe75571 2024-05-13 09:41:40 +00:00 Compare
fyrchik reviewed 2024-05-13 11:09:20 +00:00
cmd/frostfs-node/config/engine/config_test.go Outdated
@ -117,3 +117,3 @@
require.Equal(t, false, sc.RefillMetabase())
require.Equal(t, mode.ReadOnly, sc.Mode())
require.Equal(t, mode.Mode(mode.ReadOnly), sc.Mode())
fyrchik commented 2024-05-13 11:07:33 +00:00
Owner
Copy link

FYI: There is also require.EqualValues which doesn't require explicit type cast.
Don't mind leaving as is.

FYI: There is also `require.EqualValues` which doesn't require explicit type cast. Don't mind leaving as is.
pkg/local_object_storage/shard/mode/mode.go Outdated
@ -28,0 +27,4 @@
// DegradedReadOnly is a Mode value for shard that is set automatically
// after a certain number of errors is encountered. It is the same as
// `mode.Degraded` but also is read-only.
DegradedReadOnly = Degraded | ReadOnly
fyrchik commented 2024-05-13 11:08:56 +00:00
Owner
Copy link

What problem does untyped mode solve?

What problem does untyped mode solve?
achuprov commented 2024-05-13 20:47:30 +00:00
Author
Member
Copy link

We have two types: mode.Mode and mode.ComponentMode. The constants READ, READ_WRITE and CLOSED should be accessible without type casting.

We have two types: `mode.Mode` and `mode.ComponentMode`. The constants `READ`, `READ_WRITE` and `CLOSED` should be accessible without type casting.
fyrchik commented 2024-05-14 06:12:09 +00:00
Owner
Copy link

Why don't we introduce a new set of constants?

Why don't we introduce a new set of constants?
achuprov commented 2024-05-14 12:51:29 +00:00
Author
Member
Copy link

Fixed

Fixed
achuprov force-pushed feat/change_mode_shard_components from 0cebe75571 to bb8329e8d7 2024-05-13 20:21:41 +00:00 Compare
achuprov force-pushed feat/change_mode_shard_components from bb8329e8d7 to cee5e66bb6 2024-05-13 20:39:20 +00:00 Compare
achuprov force-pushed feat/change_mode_shard_components from cee5e66bb6 to 35df1b665d 2024-05-14 12:23:42 +00:00 Compare
achuprov force-pushed feat/change_mode_shard_components from 35df1b665d to 01c37d8a84 2024-05-14 12:24:34 +00:00 Compare
achuprov force-pushed feat/change_mode_shard_components from 01c37d8a84 to c9cd065b15 2024-05-14 12:50:22 +00:00 Compare
dstepanov-yadro requested changes 2024-05-14 12:55:42 +00:00
pkg/local_object_storage/pilorama/boltdb.go Outdated
@ -123,6 +123,16 @@ func (t *boltForest) Open(_ context.Context, mode mode.Mode) error {
return t.openBolt(mode)
}
func (t *boltForest) getComponentMode(m mode.Mode) mode.ComponentMode {
dstepanov-yadro commented 2024-05-14 12:55:37 +00:00
Member
Copy link

metabase/mode.go:


func (db *DB) getComponentMode(m mode.Mode) mode.ComponentMode {
	if m.NoMetabase() {
		return mode.ComponentDisabled
	}
	if m.ReadOnly() {
		return mode.ComponentReadOnly
	}
	return mode.ComponentReadWrite
}

writecache/mode.go:


func (c *cache) getComponentMode(m mode.Mode) mode.ComponentMode {
	if m.NoMetabase() {
		return mode.ComponentDisabled
	}
	if m.ReadOnly() {
		return mode.ComponentReadOnly
	}
	return mode.ComponentReadWrite
}

It should all be in one place: pkg/local_object_storage/shard/mode/mode.go

metabase/mode.go: ``` func (db *DB) getComponentMode(m mode.Mode) mode.ComponentMode { if m.NoMetabase() { return mode.ComponentDisabled } if m.ReadOnly() { return mode.ComponentReadOnly } return mode.ComponentReadWrite } ``` writecache/mode.go: ``` func (c *cache) getComponentMode(m mode.Mode) mode.ComponentMode { if m.NoMetabase() { return mode.ComponentDisabled } if m.ReadOnly() { return mode.ComponentReadOnly } return mode.ComponentReadWrite } ``` It should all be in one place: `pkg/local_object_storage/shard/mode/mode.go`
achuprov commented 2024-05-16 10:29:56 +00:00
Author
Member
Copy link

Moved

Moved
elebedeva commented 2024-05-14 13:01:27 +00:00
Member
Copy link

Why do we need two different types for shard modes and for component modes? They represent essentially the same concept and just make code harder to read. Can we just add comments to existing mode.Mode constants (maybe rename some of them) to specify their usage with Shard Components?

Also it would be nice to specify somewhere what those Shard Components are.

Why do we need two different types for shard modes and for component modes? They represent essentially the same concept and just make code harder to read. Can we just add comments to existing ```mode.Mode``` constants (maybe rename some of them) to specify their usage with ```Shard Components```? Also it would be nice to specify somewhere what those ```Shard Components``` are.
achuprov force-pushed feat/change_mode_shard_components from c9cd065b15 to b322c32b98 2024-05-16 09:48:46 +00:00 Compare
achuprov force-pushed feat/change_mode_shard_components from b322c32b98 to 0535ec070f 2024-05-16 09:49:00 +00:00 Compare
fyrchik requested changes 2024-05-16 10:40:38 +00:00
pkg/local_object_storage/shard/mode/mode.go Outdated
@ -64,0 +99,4 @@
}
// GetComponentMode maps a ShardMode to a ComponentMode.
func GetComponentMode(m Mode) ComponentMode {
fyrchik commented 2024-05-16 10:40:01 +00:00
Owner
Copy link

The name is too generic, and the implementation is too narrow:

  1. There is no 1-1 correspondence, this is why this task exists, actually.
  2. This feels like it is for metabase-like components, in this case it should be reflected in the function name.
  3. The disabled case is non-explicit and thus depends on the order of ifs.
The name is too generic, and the implementation is too narrow: 1. There is no 1-1 correspondence, this is why this task exists, actually. 2. This feels like it is for metabase-like components, in this case it should be reflected in the function name. 3. The `disabled` case is non-explicit and thus depends on the order of `if`s.
achuprov force-pushed feat/change_mode_shard_components from 0535ec070f to 4cd16e1e8c 2024-05-16 11:28:21 +00:00 Compare
achuprov commented 2024-05-16 11:47:43 +00:00
Author
Member
Copy link

@elebedeva You are correct, the concepts are similar. However, mode.Mode is responsible for the overall mode of the shard and includes a wider range of modes. Conversely, ComponentsMode can only be in R, RW, or Closed modes. We could use mode.Mode for component modes, but this would create additional requirements when using mode.Mode, which we would like to avoid.

@elebedeva You are correct, the concepts are similar. However, `mode.Mode` is responsible for the overall mode of the shard and includes a wider range of modes. Conversely, `ComponentsMode` can only be in `R`, `RW`, or `Closed` modes. We could use `mode.Mode` for component modes, but this would create additional requirements when using `mode.Mode`, which we would like to avoid.
👍 1
dstepanov-yadro approved these changes 2024-05-17 07:09:48 +00:00
fyrchik reviewed 2024-05-17 07:29:29 +00:00
fyrchik left a comment
Owner
Copy link

I don't see any changes for Blobstor.SetMode in this PR -- it is also a component.
My comment for GetComponentMode function have appeared because of this.

I don't see any changes for `Blobstor.SetMode` in this PR -- it is also a component. My comment for `GetComponentMode` function have appeared because of this.
achuprov force-pushed feat/change_mode_shard_components from 4cd16e1e8c to 6cbcfb764f 2024-05-20 13:45:40 +00:00 Compare
achuprov force-pushed feat/change_mode_shard_components from 6cbcfb764f to acded3cea9 2024-05-20 13:47:02 +00:00 Compare
achuprov force-pushed feat/change_mode_shard_components from acded3cea9 to 074612f5a0 2024-06-03 09:55:10 +00:00 Compare
achuprov force-pushed feat/change_mode_shard_components from 074612f5a0 to 3c95293c8b 2024-06-03 09:59:58 +00:00 Compare
achuprov force-pushed feat/change_mode_shard_components from 3c95293c8b to 0e9226e545 2024-06-03 10:00:50 +00:00 Compare
achuprov force-pushed feat/change_mode_shard_components from 0e9226e545 to 3e3b361f0f 2024-06-03 11:10:58 +00:00 Compare
achuprov commented 2024-06-03 11:14:36 +00:00
Author
Member
Copy link

@fyrchik Fixed

@fyrchik Fixed
fyrchik reviewed 2024-06-04 11:12:26 +00:00
pkg/local_object_storage/blobstor/common/storage.go Outdated
@ -3,13 +3,15 @@ package common
import (
"context"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
fyrchik commented 2024-06-04 11:12:24 +00:00
Owner
Copy link

Please, look at the import groups, we use 2 groups, 1 for stdlib, the second for other.
You might want to adjust the setting of your IDE

Please, look at the import groups, we use 2 groups, 1 for stdlib, the second for other. You might want to adjust the setting of your IDE
fyrchik approved these changes 2024-06-04 11:21:02 +00:00
achuprov force-pushed feat/change_mode_shard_components from 3e3b361f0f to 17703f5e16 2024-06-04 13:29:46 +00:00 Compare
achuprov force-pushed feat/change_mode_shard_components from 17703f5e16 to ce7500f003 2024-06-04 13:30:22 +00:00 Compare
fyrchik approved these changes 2024-06-04 14:36:33 +00:00
acid-ant approved these changes 2024-06-04 14:43:42 +00:00
dstepanov-yadro approved these changes 2024-06-04 14:45:24 +00:00
fyrchik merged commit 8fcd0f8f8d into master 2024-06-05 05:55:27 +00:00
fyrchik referenced this pull request from a commit 2024-06-05 05:55:29 +00:00
[#1121] node: Refactor mods of shard
Sign in to join this conversation.
Reviewers
No reviewers
fyrchik
acid-ant
dstepanov-yadro
TrueCloudLab/storage-core-developers
Labels
Clear labels   
P0

Highest

  
P1

High

  
P2

Medium

  
P3

Low

  
badger

Badger DB related issues

  
frostfs-adm

   
frostfs-cli

   
frostfs-ir

   
frostfs-lens

   
frostfs-node

   
good first issue

Good for newcomers

  
triage
  
Infrastructure

Infrastructure, Automation, CI/CD or DevOps related stuff

  
blocked

The issue or PR is blocked by something

  
bug

Something is not working

  
config

Configuration format update or breaking change

  
discussion

Talking about something in order to reach a decision or to exchange ideas

  
documentation

Documentation related

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
go

Language features adoption

  
help wanted

Extra attention is needed

  
internal

   
invalid

Something is wrong

  
kludge

This is a kludge and we know it

  
observability

Related to metrics, tracing and logs

  
perfomance

Perfomance related

  
question

More information is needed

  
refactoring

Refactoring

  
wontfix

This won't be fixed

No labels
P0
P1
P2
P3
badger
frostfs-adm
frostfs-cli
frostfs-ir
frostfs-lens
frostfs-node
good first issue
triage
Infrastructure
blocked
bug
config
discussion
documentation
duplicate
enhancement
go
help wanted
internal
invalid
kludge
observability
perfomance
question
refactoring
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
5 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: TrueCloudLab/frostfs-node#1121
No description provided.
Delete branch "achuprov/frostfs-node:feat/change_mode_shard_components"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?