Skip to content

Commit 4a63f4b

Browse files
committedJan 30, 2025·
Update max lock-id-ttl
1 parent 0e00de1 commit 4a63f4b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed
 

‎flyway-database-yugabytedb/src/main/java/org/flywaydb/community/database/postgresql/yugabytedb/YugabyteDBExecutionTemplate.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public class YugabyteDBExecutionTemplate {
2222
private static final Map<String, Boolean> tableEntries = new ConcurrentHashMap<>();
2323
private static final Random random = new Random();
2424
public static final int DEFAULT_LOCK_ID_TTL = 1000 * 60 * 5;
25-
public static final int MAX_LOCK_ID_TTL = 1000 * 60 * 30;
26-
public static final String LOCK_ID_TTL_SYS_PROP_NAME = "flyway.yugabytedb.lock-id-ttl";
25+
public static final int MAX_LOCK_ID_TTL = 1000 * 60 * 60;
26+
public static final String LOCK_ID_TTL_SYS_PROP_NAME = "flyway.yugabytedb.lock-id-ttl-ms";
2727

2828
YugabyteDBExecutionTemplate(JdbcTemplate jdbcTemplate, String tableName) {
2929
this.jdbcTemplate = jdbcTemplate;
@@ -105,7 +105,7 @@ private long tryLock() {
105105
lockIdTtl = Long.parseLong(sysProp);
106106
lockIdTtl = lockIdTtl < 0 || lockIdTtl > MAX_LOCK_ID_TTL ? DEFAULT_LOCK_ID_TTL : lockIdTtl;
107107
} catch (NumberFormatException e) {
108-
LOG.warn("Invalid value for flyway.yugabytedb.lockIdTtl: " + sysProp + ". Using default value " + DEFAULT_LOCK_ID_TTL + " ms");
108+
LOG.warn("Invalid value for " + LOCK_ID_TTL_SYS_PROP_NAME + ": " + sysProp + ". Using default value: " + DEFAULT_LOCK_ID_TTL + " ms");
109109
}
110110
}
111111

@@ -114,7 +114,7 @@ private long tryLock() {
114114
if (lockIdRead == 0) {
115115
LOG.debug(Thread.currentThread().getName() + "> Setting lock_id = " + lockIdToBeReturned);
116116
} else {
117-
LOG.warn(Thread.currentThread().getName() + "> Lock is older than 5 minutes for lock_id " + lockIdRead + ". Resetting it to " + lockIdToBeReturned);
117+
LOG.warn(Thread.currentThread().getName() + "> Lock with lock_id " + lockIdRead + " is held for more than " + lockIdTtl + " millis. Resetting it with lock_id " + lockIdToBeReturned);
118118
}
119119
String updateLockId = "UPDATE " + YugabyteDBDatabase.LOCK_TABLE_NAME
120120
+ " SET lock_id = " + lockIdToBeReturned + ", ts = '" + current + "' WHERE table_name = '"

0 commit comments

Comments
 (0)
Please sign in to comment.