include cluster name in lock key, handle unexpired locks