Skip to content

Add db_operation_timeout BOSH property for locket#1150

Open
vlast3k wants to merge 1 commit into
cloudfoundry:developfrom
vlast3k:fix-locket-context-propagation
Open

Add db_operation_timeout BOSH property for locket#1150
vlast3k wants to merge 1 commit into
cloudfoundry:developfrom
vlast3k:fix-locket-context-propagation

Conversation

@vlast3k

@vlast3k vlast3k commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Companion change for cloudfoundry/locket#40

Resubmission of #1141 (reverted in #1148 due to merge conflict with health check properties).

What was wrong with #1141

The PR was based on v2.135.0 and didn't account for the health check if_p blocks added to locket.json.erb on develop. When merged, the auto-merge produced broken ERB (syntax error at line 109). This version is rebased on current develop with the conflict properly resolved.

Changes

  • jobs/locket/spec — new property diego.locket.sql.db_operation_timeout (default: "10" seconds)
  • jobs/locket/templates/locket.json.erb — renders the property as "db_operation_timeout": "10s"
  • spec/locket_template_spec.rb — new template spec for locket (6 examples)

Testing

$ rspec spec/locket_template_spec.rb
6 examples, 0 failures

$ rspec spec/
95 examples, 1 failure (pre-existing auctioneer IPAddr issue, unrelated)

Related

Companion change for cloudfoundry/locket#40 (context detach fix).

Adds diego.locket.sql.db_operation_timeout property (default: 10s)
that controls the independent timeout for handler-initiated DB
operations. This allows operators to tune the timeout without
recompiling the locket binary.

Also adds locket_template_spec.rb covering timeout configuration
rendering — no such spec existed previously.
@vlast3k vlast3k requested a review from a team as a code owner June 17, 2026 04:21
@vlast3k

vlast3k commented Jun 17, 2026

Copy link
Copy Markdown
Contributor Author

@mariash this is the updated commit. The last one was indeed broken due to merge conflicts as i ran the tests prior to the merge and not afterwards

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Development

Successfully merging this pull request may close these issues.

1 participant