Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

extend grep filter to accept microsecond precision in tags #3301

Merged
merged 2 commits into from Jul 6, 2023

Conversation

rptaylor
Copy link
Contributor

@rptaylor rptaylor commented Jun 30, 2023

In some cases the tag names can have extra precision in their timestamps. This extends the filter to accept a potential dot and up to 3 digits for microseconds.

Fix #3271

It works based on this simple test:

$ cat tags
generic-2023-05-04T22:00:25Z     │    13476 │ 4 May 2023 15:00:49  │        │ 
generic-2023-05-04T22:51:06Z     │    13478 │ 4 May 2023 15:51:27  │        │ 
generic-2023-05-05T21:20:12.918Z │    13480 │ 5 May 2023 14:20:13  │        │ 
generic-2023-05-07T15:05:56.115Z │    13481 │ 7 May 2023 08:05:57  │        │ 
# previous filter
$ grep -E  '^generic(_[[:digit:]]+)?-[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}T[[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}Z' tags
generic-2023-05-04T22:00:25Z     │    13476 │ 4 May 2023 15:00:49  │        │ 
generic-2023-05-04T22:51:06Z     │    13478 │ 4 May 2023 15:51:27  │        │ 
# updated filter
$ grep -E '^generic(_[[:digit:]]+)?-[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}T[[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}\.?[[:digit:]]{0,3}Z' tags
generic-2023-05-04T22:00:25Z     │    13476 │ 4 May 2023 15:00:49  │        │ 
generic-2023-05-04T22:51:06Z     │    13478 │ 4 May 2023 15:51:27  │        │ 
generic-2023-05-05T21:20:12.918Z │    13480 │ 5 May 2023 14:20:13  │        │ 
generic-2023-05-07T15:05:56.115Z │    13481 │ 7 May 2023 08:05:57  │        │ 

@cernvm-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@rptaylor
Copy link
Contributor Author

@HereThereBeDragons this is an important fix required for GC to run in our environment, could we get it in 2.11 or a 2.10.x ?

@jblomer
Copy link
Member

jblomer commented Jul 3, 2023

@cernvm-bot cloudtest

@cernvm-bot
Copy link
Collaborator

building for cloudtests finished: SUCCESS
https://lcgapp-services.cern.ch/cvmfs-jenkins/job/CvmfsFullBuildDocker/3914/

@cernvm-bot
Copy link
Collaborator

@vvolkl
Copy link
Contributor

vvolkl commented Jul 5, 2023

@cernvm-bot cloudtest

@jblomer jblomer requested a review from vvolkl July 5, 2023 16:09
@cernvm-bot
Copy link
Collaborator

building for cloudtests finished: SUCCESS
https://lcgapp-services.cern.ch/cvmfs-jenkins/job/CvmfsFullBuildDocker/3919/

@cernvm-bot
Copy link
Collaborator

@vvolkl
Copy link
Contributor

vvolkl commented Jul 6, 2023

Test failure unrelated

@vvolkl vvolkl merged commit 01d7ed2 into cvmfs:devel Jul 6, 2023
1 of 2 checks passed
@HereThereBeDragons HereThereBeDragons added this to the 2.11 milestone Jul 7, 2023
@rptaylor rptaylor deleted the fix-tag-grep-filter branch July 25, 2023 20:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GC ignores tags with different date format
5 participants