#60 Fix deduplication for #11204
Merged by smooge. Opened by james.
james/mirrors-countme main  into  main

Download 60.patch

I think this fixes #11204.

Basically the "deduplication" happened once for the first line of a log file, and if that triggered then it skipped the entire logfile.

This does mean that all the old numbers will now be slightly "wrong" because there are duplicates in the middle of the data. Eg.

JDBG: _dup: CountmeItem(timestamp=1673222415, host='xxxx', os_name='Rocky Linux', os_version='8.7', os_variant='generic', os_arch='x86_64', sys_age=1, repo_tag='epel-8', repo_arch='x86_64')
JDBG: _dup: CountmeItem(timestamp=1673222415, host='xxxx', os_name='Rocky Linux', os_version='8.7', os_variant='generic', os_arch='x86_64', sys_age=1, repo_tag='epel-8', repo_arch='x86_64')

...where before this patch that would be two entries, unless it was the first line in a new logfile in which case it skipped the entire file.

Not going to merge before I rerun all the data for this year, at least once, but feel free to review.

Also contains a second patch which is a variant of smooge's parse_sql fix.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/31dbb378cb8942868618f5dc5c1a40c8

  • tox-f33 : NODE_FAILURE Node request 200-0005876258 failed in 0s

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/83f411d39e69461a979622416f616106

  • tox-f33 : NODE_FAILURE Node request 200-0005876418 failed in 0s

1 new commit added

  • Update Zuul to f38.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/cae152dfb053421cae878b10fac5b221

  • tox-f38 : NODE_FAILURE Node request 200-0005876419 failed in 0s

1 new commit added

  • Update label from: https://fedora.softwarefactory-project.io/zuul/labels

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/f58b10b1a7ba4034b67ef2564e0774df

1 new commit added

  • Try using relative paths for CI.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/fdc26423f162483783f5fbe6f163c1ab

1 new commit added

  • Fix the 2nd parse_qsl() typo for the simple fix.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/3f293b59a53041628395b8168d9975b5

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/fa42d2fa4d6a40a293860ac5cce3acca

1 new commit added

  • Remove lint from default/CI tests.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/fac069e50b084746a15dd4ede86b9c18

1 new commit added

  • Skip the hypothesis generated data tests for Zuul/CI.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/1e8dac607e9b463b93fbb0c164791f3a

OK I don't know enough about zuul to say if this is "REQUIRED" for a merge. I am going to say this is good enough and think it can be merged. Thanks for finding it.

Pull-Request has been merged by smooge

Metadata