LukeParke/libopenapi
1
0
Fork 0
mirror of https://github.com/LukeHagar/libopenapi.git synced 2025-12-09 12:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed runaway rolodex.

Browse Source 
The rolodex was running away and locking up vacuum.

Signed-off-by: quobix <dave@quobix.com>
This commit is contained in:
quobix
2024-01-31 15:15:24 -08:00
parent c55527066a
commit a24c05036b
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodel/low/v3/create_document.go
View File

@@ -108,7 +108,7 @@ func createDocument(info *datamodel.SpecInfo, config *datamodel.DocumentConfigur
} }
// check for circular references // check for circular references
if config.Logger != nil { if config.Logger != nil {
config.Logger.Debug("indexing rolodex") config.Logger.Debug("checking for circular references")
} }
now = time.Now() now = time.Now()
if !config.SkipCircularReferenceCheck { if !config.SkipCircularReferenceCheck {

2
index/find_component.go
View File

@@ -58,7 +58,7 @@ func FindComponent(root *yaml.Node, componentId, absoluteFilePath string, index
friendlySearch = "$" friendlySearch = "$"
} }
path, err := yamlpath.NewPath(friendlySearch) path, err := yamlpath.NewPath(friendlySearch)
if path == nil || err != nil { if path == nil || err != nil || root == nil {
return nil // no component found return nil // no component found
} }
res, _ := path.Find(root) res, _ := path.Find(root)

5
index/rolodex_file_loader.go
View File

@@ -108,6 +108,7 @@ func (l *LocalFS) Open(name string) (fs.File, error) {
extractedFile, extErr = l.extractFile(name) extractedFile, extErr = l.extractFile(name)
if extErr != nil { if extErr != nil {
l.processingFiles.Delete(name) l.processingFiles.Delete(name)
processingWaiter.done = true
return nil, extErr return nil, extErr
} }
if extractedFile != nil { if extractedFile != nil {
@@ -152,6 +153,10 @@ func (l *LocalFS) Open(name string) (fs.File, error) {
} }
} }
} }
waiter, _ := l.processingFiles.Load(name)
if waiter != nil {
waiter.(*waiterLocal).done = true
}
l.processingFiles.Delete(name) l.processingFiles.Delete(name)
return nil, &fs.PathError{Op: "open", Path: name, Err: fs.ErrNotExist} return nil, &fs.PathError{Op: "open", Path: name, Err: fs.ErrNotExist}
} }

6
index/rolodex_remote_loader.go
View File

@@ -284,6 +284,11 @@ func (i *RemoteFS) Open(remoteURL string) (fs.File, error) {
"AllowRemoteLookup to true as part of the index configuration", remoteURL) "AllowRemoteLookup to true as part of the index configuration", remoteURL)
} }
if !strings.HasPrefix(remoteURL, "http") {
i.logger.Debug("[rolodex remote loader] not a remote file, ignoring", "file", remoteURL)
return nil, nil
}
remoteParsedURL, err := url.Parse(remoteURL) remoteParsedURL, err := url.Parse(remoteURL)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -306,6 +311,7 @@ func (i *RemoteFS) Open(remoteURL string) (fs.File, error) {
"remoteURL", remoteParsedURL.String()) "remoteURL", remoteParsedURL.String())
for !wait.done { for !wait.done {
i.logger.Debug("[rolodex remote loader] sleeping, waiting for file to return", "file", remoteURL)
time.Sleep(500 * time.Nanosecond) // breathe for a few nanoseconds. time.Sleep(500 * time.Nanosecond) // breathe for a few nanoseconds.
} }