cherry pick 3.1.0 prometheus#152

yuchen-db wants to merge 1 commit intodb_maindatabricks/thanos:db_mainfrom

yuchen-db/prometheus-lock-fixdatabricks/thanos:yuchen-db/prometheus-lock-fixCopy head branch name to clipboard