Skip to content

Make maximumLogSizeBytes configurable #67

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

Open
HongboDu-at wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make maximumLogSizeBytes configurable #67

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions cmd/bb_browser/browser_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,21 @@ type BrowserService struct {
initialSizeClassCache blobstore.BlobAccess
fileSystemAccessCache blobstore.BlobAccess
maximumMessageSizeBytes int
maximumLogSizeBytes int
templates *template.Template
bbClientdInstanceNamePatcher digest.InstanceNamePatcher
}

// NewBrowserService constructs a BrowserService that accesses storage
// through a set of handles.
func NewBrowserService(contentAddressableStorage, actionCache, initialSizeClassCache, fileSystemAccessCache blobstore.BlobAccess, maximumMessageSizeBytes int, templates *template.Template, bbClientdInstanceNamePatcher digest.InstanceNamePatcher, router *mux.Router) *BrowserService {
func NewBrowserService(contentAddressableStorage, actionCache, initialSizeClassCache, fileSystemAccessCache blobstore.BlobAccess, maximumMessageSizeBytes int, maximumLogSizeBytes int, templates *template.Template, bbClientdInstanceNamePatcher digest.InstanceNamePatcher, router *mux.Router) *BrowserService {
s := &BrowserService{
contentAddressableStorage: contentAddressableStorage,
actionCache: actionCache,
initialSizeClassCache: initialSizeClassCache,
fileSystemAccessCache: fileSystemAccessCache,
maximumMessageSizeBytes: maximumMessageSizeBytes,
maximumLogSizeBytes: maximumLogSizeBytes,
templates: templates,
bbClientdInstanceNamePatcher: bbClientdInstanceNamePatcher,
}
Expand Down Expand Up @@ -300,7 +302,7 @@ func (s *BrowserService) getLogInfoFromActionResult(ctx context.Context, name st
}

func (s *BrowserService) getLogInfoForDigest(ctx context.Context, name string, digest digest.Digest) (*logInfo, error) {
maximumLogSizeBytes := 100000
maximumLogSizeBytes := s.maximumLogSizeBytes
if size := digest.GetSizeBytes(); size == 0 {
// No log file present.
return nil, nil
Expand Down
5 changes: 5 additions & 0 deletions cmd/bb_browser/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,12 +304,17 @@ func main() {

router := mux.NewRouter()
subrouter := router.PathPrefix(routePrefix).Subrouter()
maximumLogSizeBytes := int(configuration.MaximumLogSizeBytes)
if maximumLogSizeBytes == 0 {
maximumLogSizeBytes = 100000
}
NewBrowserService(
contentAddressableStorage,
actionCache,
initialSizeClassCache,
fileSystemAccessCache,
int(configuration.MaximumMessageSizeBytes),
maximumLogSizeBytes,
templates,
bbClientdInstanceNamePatcher,
subrouter)
Expand Down
5 changes: 5 additions & 0 deletions pkg/proto/configuration/bb_browser/bb_browser.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,9 @@ message ApplicationConfiguration {
// expression `{}` (including the backticks).
buildbarn.configuration.jmespath.Expression
request_metadata_links_jmespath_expression = 11;

// Maximum log size to display inline in the web UI. Logs larger than
// this will show a link to download instead of displaying inline.
// Defaults to 100000 bytes if not specified.
int64 maximum_log_size_bytes = 12;
}