@@ -2260,6 +2260,127 @@ TEST(watcher_sustained_failure_logs_once_issue2015) {
22602260 PASS ();
22612261}
22622262
2263+ /* ── Success cooldown (#2835) ─────────────────────────────────────── */
2264+
2265+ TEST (success_delay_fast_index_keeps_interval ) {
2266+ ASSERT_EQ (cbm_watcher_success_delay_ms (5000 , 0 ), 5000 );
2267+ ASSERT_EQ (cbm_watcher_success_delay_ms (5000 , 1 ), 5000 );
2268+ ASSERT_EQ (cbm_watcher_success_delay_ms (5000 , 1666 ), 5000 ); /* 3x < interval */
2269+ ASSERT_EQ (cbm_watcher_success_delay_ms (60000 , 20000 ), 60000 );
2270+ PASS ();
2271+ }
2272+
2273+ TEST (success_delay_slow_index_scales_by_factor ) {
2274+ ASSERT_EQ (cbm_watcher_success_delay_ms (5000 , 1667 ), 5001 );
2275+ ASSERT_EQ (cbm_watcher_success_delay_ms (5000 , 10000 ), 30000 );
2276+ /* 90 s rebuild → next poll 4.5 min after it finishes. */
2277+ ASSERT_EQ (cbm_watcher_success_delay_ms (60000 , 90000 ), 270000 );
2278+ PASS ();
2279+ }
2280+
2281+ TEST (success_delay_clamped_and_degenerate ) {
2282+ /* Capped at 5 min (INDEX_FAIL_CEILING_MS) from 100 s of indexing up. */
2283+ ASSERT_EQ (cbm_watcher_success_delay_ms (5000 , 100000 ), 300000 );
2284+ ASSERT_EQ (cbm_watcher_success_delay_ms (5000 , 100001 ), 300000 );
2285+ ASSERT_EQ (cbm_watcher_success_delay_ms (60000 , 300000 ), 300000 );
2286+ ASSERT_EQ (cbm_watcher_success_delay_ms (5000 , INT64_MAX ), 300000 );
2287+ ASSERT_EQ (cbm_watcher_success_delay_ms (5000 , -1 ), 5000 );
2288+ ASSERT_EQ (cbm_watcher_success_delay_ms (5000 , INT64_MIN ), 5000 );
2289+ ASSERT_EQ (cbm_watcher_success_delay_ms (-1 , 0 ), 0 );
2290+ /* Never below the caller's own cadence, even above the ceiling. */
2291+ ASSERT_EQ (cbm_watcher_success_delay_ms (INT_MAX , INT64_MAX ), INT_MAX );
2292+ PASS ();
2293+ }
2294+
2295+ TEST (success_delay_is_monotonic ) {
2296+ int previous = cbm_watcher_success_delay_ms (5000 , 0 );
2297+ for (int64_t e = 0 ; e <= 2000000 ; e += 997 ) {
2298+ int delay = cbm_watcher_success_delay_ms (5000 , e );
2299+ ASSERT_TRUE (delay >= previous );
2300+ ASSERT_TRUE (delay >= 5000 && delay <= 300000 );
2301+ previous = delay ;
2302+ }
2303+ PASS ();
2304+ }
2305+
2306+ /* Wire-up: the cooldown must be measured around the real index_fn call and
2307+ * counted from when the index finished. The watcher's clock is frozen via a
2308+ * test seam and the callback advances it, so an index "takes" a chosen time
2309+ * with no sleep and the scheduled poll time can be asserted exactly. */
2310+ #define COOL_NS_PER_MS 1000000LL
2311+ static int64_t cool_clock_ns = 0 ;
2312+ static int64_t cool_index_ms = 0 ;
2313+ static int cool_index_calls = 0 ;
2314+ static int cool_index_callback (const char * name , const char * path , void * ud ) {
2315+ (void )name ;
2316+ (void )path ;
2317+ (void )ud ;
2318+ cool_index_calls ++ ;
2319+ cool_clock_ns += cool_index_ms * COOL_NS_PER_MS ;
2320+ cbm_watcher_test_set_clock_ns (cool_clock_ns );
2321+ return 0 ;
2322+ }
2323+
2324+ /* Re-index once (touch + poll until the callback runs; a transient git probe
2325+ * failure makes a poll a no-op, see the sustained-failure test) and return
2326+ * the scheduled next poll relative to when the index finished, in ms. */
2327+ static int64_t cool_reindex_delay_ms (cbm_watcher_t * w , const char * file , const char * line ,
2328+ int64_t index_ms ) {
2329+ cool_index_ms = index_ms ;
2330+ th_append_file (file , line );
2331+ int target = cool_index_calls + 1 ;
2332+ while (cool_index_calls < target ) {
2333+ cbm_watcher_touch (w , "cool-repo" );
2334+ cbm_watcher_poll_once (w );
2335+ }
2336+ return (cbm_watcher_test_next_poll_ns (w , "cool-repo" ) - cool_clock_ns ) / COOL_NS_PER_MS ;
2337+ }
2338+
2339+ TEST (watcher_success_cooldown_measures_index_issue2835 ) {
2340+ char tmpdir [256 ];
2341+ snprintf (tmpdir , sizeof (tmpdir ), "/tmp/cbm_watcher_cool_XXXXXX" );
2342+ if (!cbm_mkdtemp (tmpdir ))
2343+ FAIL ("cbm_mkdtemp failed" );
2344+ if (wt_git (tmpdir , "init -q" ) != 0 ) {
2345+ th_rmtree (tmpdir );
2346+ FAIL ("git init failed" );
2347+ }
2348+ char p [300 ];
2349+ th_write_file (wt_path (p , sizeof (p ), tmpdir , "file.txt" ), "hello\n" );
2350+ wt_git (tmpdir , "add file.txt" );
2351+ wt_git (tmpdir , "commit -q -m init" );
2352+
2353+ cool_clock_ns = 1000LL * 1000 * COOL_NS_PER_MS ; /* any nonzero start */
2354+ cbm_watcher_test_set_clock_ns (cool_clock_ns );
2355+ cool_index_calls = 0 ;
2356+
2357+ cbm_store_t * store = cbm_store_open_memory ();
2358+ cbm_watcher_t * w = cbm_watcher_new (store , cool_index_callback , NULL );
2359+ cbm_watcher_watch (w , "cool-repo" , tmpdir );
2360+ cbm_watcher_poll_once (w ); /* baseline */
2361+
2362+ wt_path (p , sizeof (p ), tmpdir , "file.txt" );
2363+ /* Instant index: plain cadence. */
2364+ int64_t fast = cool_reindex_delay_ms (w , p , "a\n" , 0 );
2365+ /* 60 s index → 3 x 60 s, counted from the END of the index (anchoring at
2366+ * the start would give 120 s here). */
2367+ int64_t slow = cool_reindex_delay_ms (w , p , "b\n" , 60000 );
2368+ /* 200 s index → 600 s, capped at 5 min. */
2369+ int64_t capped = cool_reindex_delay_ms (w , p , "c\n" , 200000 );
2370+
2371+ /* Restore the real clock before any assert can return early. */
2372+ cbm_watcher_test_set_clock_ns (0 );
2373+
2374+ ASSERT_EQ (fast , cbm_watcher_poll_interval_ms (1 ));
2375+ ASSERT_EQ (slow , 180000 );
2376+ ASSERT_EQ (capped , 300000 );
2377+
2378+ cbm_watcher_free (w );
2379+ cbm_store_close (store );
2380+ th_rmtree (tmpdir );
2381+ PASS ();
2382+ }
2383+
22632384TEST (watcher_index_failure_count_unknown_project ) {
22642385 cbm_store_t * store = cbm_store_open_memory ();
22652386 cbm_watcher_t * w = cbm_watcher_new (store , index_callback , NULL );
@@ -4043,6 +4164,11 @@ SUITE(watcher) {
40434164 RUN_TEST (index_backoff_never_schedules_sooner_than_the_interval );
40444165 RUN_TEST (watcher_index_failure_streak_increments_and_resets_issue2015 );
40454166 RUN_TEST (watcher_index_failure_backoff_gates_repolling_issue2015 );
4167+ RUN_TEST (success_delay_fast_index_keeps_interval );
4168+ RUN_TEST (success_delay_slow_index_scales_by_factor );
4169+ RUN_TEST (success_delay_clamped_and_degenerate );
4170+ RUN_TEST (success_delay_is_monotonic );
4171+ RUN_TEST (watcher_success_cooldown_measures_index_issue2835 );
40464172 RUN_TEST (watcher_sustained_failure_logs_once_issue2015 );
40474173 RUN_TEST (watcher_index_failure_count_unknown_project );
40484174 RUN_TEST (watcher_project_info_publishes_scan_issue2167 );
0 commit comments