Skip to content

revert check absolute #1358

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
giurgiur99 merged 1 commit into from
Apr 28, 2026
Merged

revert check absolute #1358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 2 additions & 37 deletions src/components/persistentStorage/PersistentStorageLocalFS.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import fsp from 'fs/promises'
import path from 'path'
import { pipeline } from 'stream/promises'
import { randomUUID } from 'crypto'
import Dockerode from 'dockerode'

import type { AccessList } from '../../@types/AccessList.js'
import type {
Expand All @@ -24,18 +23,13 @@ import { CORE_LOGGER } from '../../utils/logging/common.js'
export class PersistentStorageLocalFS extends PersistentStorageFactory {
/* eslint-disable security/detect-non-literal-fs-filename -- localfs backend operates on filesystem paths */
private baseFolder: string
// Host path equivalent of baseFolder, used as the Source for algorithm bind mounts.
private hostBaseFolder: string
private hostBaseFolderReady: Promise<void>

constructor(node: OceanNode) {
super(node)
const options = node.getConfig().persistentStorage
.options as PersistentStorageLocalFSOptions

this.baseFolder = path.resolve(options.folder)
this.hostBaseFolder = this.baseFolder
this.hostBaseFolderReady = this.detectHostBaseFolder()
this.baseFolder = options.folder

// Ensure base folder exists and is a directory (sync to avoid startup races).
try {
Expand All @@ -62,34 +56,6 @@ export class PersistentStorageLocalFS extends PersistentStorageFactory {
return path.join(this.baseFolder, 'buckets', bucketId)
}

// Resolve baseFolder to its host path so bind mounts use a Source the daemon
// can find. No-op outside Docker.
private async detectHostBaseFolder(): Promise<void> {
try {
const containerId = fs.readFileSync('/etc/hostname', 'utf8').trim()
if (!containerId) return
const docker = new Dockerode({ socketPath: '/var/run/docker.sock' })
const { Mounts = [] } = await docker.getContainer(containerId).inspect()
const covering = Mounts.filter(
(m) =>
this.baseFolder === m.Destination ||
this.baseFolder.startsWith(m.Destination + '/')
).sort((a, b) => b.Destination.length - a.Destination.length)[0]
if (!covering) return
this.hostBaseFolder = path.join(
covering.Source,
path.relative(covering.Destination, this.baseFolder)
)
CORE_LOGGER.info(
`Persistent storage host path resolved: ${this.baseFolder} -> ${this.hostBaseFolder}`
)
} catch (e: any) {
CORE_LOGGER.debug(
`Persistent storage host path detection skipped: ${e?.message ?? e}`
)
}
}

private async ensureBucketExists(bucketId: string): Promise<void> {
this.validateBucket(bucketId)
const bucketsRoot = path.resolve(this.baseFolder, 'buckets')
Expand Down Expand Up @@ -240,9 +206,8 @@ export class PersistentStorageLocalFS extends PersistentStorageFactory {
await this.assertConsumerAllowedForBucket(consumerAddress, bucketId)
}
await this.ensureFileExists(bucketId, fileName)
await this.hostBaseFolderReady

const source = path.join(this.hostBaseFolder, 'buckets', bucketId, fileName)
const source = path.join(this.bucketPath(bucketId), fileName)
const target = path.posix.join('/data', 'persistentStorage', bucketId, fileName)

return {
Expand Down
Loading