Skip to content

[history server] move storage interface #4302

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.

Sign up for GitHub

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

Merged
rueian merged 4 commits into from
Jan 8, 2026
Merged

[history server] move storage interface #4302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a1dfaf
historyserver: move storage and update imports
my-vegetable-has-exploded Dec 22, 2025
632ad2a
vet & fmt.
my-vegetable-has-exploded Dec 22, 2025
6cde389
chroe: update code structure and move storage to interface
my-vegetable-has-exploded Jan 4, 2026
12cb11e
Merge remote-tracking branch 'origin/master' into move/historyserver-…
my-vegetable-has-exploded Jan 4, 2026
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
6 changes: 3 additions & 3 deletions historyserver/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ Each backend requires specific configuration parameters passed through environme
### Code Structure

- `cmd/`: Main applications (collector and historyserver)
- `backend/`: Core logic for storage backends and collection
- `backend/collector/`: Collector-specific code
- `backend/historyserver/`: History server implementation
- `pkg/`: Core logic for storage backends and collection
- `pkg/collector/`: Collector-specific code
- `pkg/storage/`: Storage backend implementations
Comment on lines +121 to +123
Copy link
Contributor

@JiangJiaWei1103 JiangJiaWei1103 Jan 4, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

Great! The modification is within the scope of this PR.

Just a quick reminder: this documentation doesn’t reflect the current history server code structure (e.g., missing eventserver/). Instead of adding more components on top of outdated docs, I suggest opening a separate issue to update the documentation. Since the history server is still under active development, it may be better to postpone the doc update until we have a first stable version.

Issue link: #4338

cc @Future-Outlier

- `dashboard/`: Web UI files

### Testing
Expand Down
2 changes: 1 addition & 1 deletion historyserver/pkg/collector/eventserver/eventserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/fsnotify/fsnotify"
"github.com/sirupsen/logrus"

"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
"github.com/ray-project/kuberay/historyserver/pkg/storage"
)

type Event struct {
Expand Down
2 changes: 1 addition & 1 deletion historyserver/pkg/collector/logcollector/runtime/logcollector/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/fsnotify/fsnotify"
"github.com/sirupsen/logrus"

"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
"github.com/ray-project/kuberay/historyserver/pkg/storage"
"github.com/ray-project/kuberay/historyserver/pkg/utils"
)

Expand Down
2 changes: 1 addition & 1 deletion historyserver/pkg/collector/logcollector/runtime/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"time"

"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/runtime/logcollector"
"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
"github.com/ray-project/kuberay/historyserver/pkg/collector/types"
"github.com/ray-project/kuberay/historyserver/pkg/storage"
"github.com/ray-project/kuberay/historyserver/pkg/utils"
)

Expand Down
8 changes: 4 additions & 4 deletions historyserver/pkg/collector/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package collector

import (
"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage/aliyunoss/ray"
"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage/localtest"
"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage/s3"
"github.com/ray-project/kuberay/historyserver/pkg/collector/types"
"github.com/ray-project/kuberay/historyserver/pkg/storage"
"github.com/ray-project/kuberay/historyserver/pkg/storage/aliyunoss/ray"
"github.com/ray-project/kuberay/historyserver/pkg/storage/localtest"
"github.com/ray-project/kuberay/historyserver/pkg/storage/s3"
)

type WriterRegistry map[string]func(globalData *types.RayCollectorConfig, data map[string]interface{}) (storage.StorageWriter, error)
Expand Down
0 .../logcollector/storage/aliyunoss/README.md → ...oryserver/pkg/storage/aliyunoss/README.md
View file
Open in desktop
File renamed without changes.
0 ...llector/storage/aliyunoss/config/types.go → ...ver/pkg/storage/aliyunoss/config/types.go
View file
Open in desktop
File renamed without changes.
0 ...ctor/storage/aliyunoss/config/validate.go → .../pkg/storage/aliyunoss/config/validate.go
View file
Open in desktop
File renamed without changes.
0 ...collector/storage/aliyunoss/ray/config.go → ...erver/pkg/storage/aliyunoss/ray/config.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...logcollector/storage/aliyunoss/ray/ray.go → ...ryserver/pkg/storage/aliyunoss/ray/ray.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"github.com/aliyun/aliyun-oss-go-sdk/oss"
"github.com/sirupsen/logrus"

"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage/aliyunoss/rrsa"
"github.com/ray-project/kuberay/historyserver/pkg/collector/types"
"github.com/ray-project/kuberay/historyserver/pkg/storage"
"github.com/ray-project/kuberay/historyserver/pkg/storage/aliyunoss/rrsa"
"github.com/ray-project/kuberay/historyserver/pkg/utils"
)

Expand Down
0 ...llector/storage/aliyunoss/ray/ray_test.go → ...ver/pkg/storage/aliyunoss/ray/ray_test.go
View file
Open in desktop
File renamed without changes.
0 ...ctor/storage/aliyunoss/rrsa/credential.go → .../pkg/storage/aliyunoss/rrsa/credential.go
View file
Open in desktop
File renamed without changes.
0 ...llector/logcollector/storage/interface.go → historyserver/pkg/storage/interface.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../logcollector/storage/localtest/reader.go → ...oryserver/pkg/storage/localtest/reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"io"
"strings"

"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
"github.com/ray-project/kuberay/historyserver/pkg/collector/types"
"github.com/ray-project/kuberay/historyserver/pkg/storage"
"github.com/ray-project/kuberay/historyserver/pkg/utils"
)

Expand Down
2 changes: 1 addition & 1 deletion .../logcollector/storage/localtest/writer.go → ...oryserver/pkg/storage/localtest/writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package localtest
import (
"io"

"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
"github.com/ray-project/kuberay/historyserver/pkg/collector/types"
"github.com/ray-project/kuberay/historyserver/pkg/storage"
)

// MockWriter is a mock implementation of the StorageWriter interface
Expand Down
0 ...llector/logcollector/storage/s3/README.md → historyserver/pkg/storage/s3/README.md
View file
Open in desktop
File renamed without changes.
0 ...llector/logcollector/storage/s3/config.go → historyserver/pkg/storage/s3/config.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...g/collector/logcollector/storage/s3/s3.go → historyserver/pkg/storage/s3/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
"github.com/aws/aws-sdk-go/service/s3"
"github.com/sirupsen/logrus"

"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
"github.com/ray-project/kuberay/historyserver/pkg/collector/types"
"github.com/ray-project/kuberay/historyserver/pkg/storage"
"github.com/ray-project/kuberay/historyserver/pkg/utils"
)

Expand Down
0 ...lector/logcollector/storage/s3/s3_test.go → historyserver/pkg/storage/s3/s3_test.go
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion historyserver/pkg/storage/storage.go
View file
Open in desktop

This file was deleted.

Loading