From de09c792613165127692e24c3606992af2382a0743bdbcd4f5c2ddc459142b19 Mon Sep 17 00:00:00 2001 From: Andrii Nikitin Date: Thu, 28 Oct 2021 09:01:14 +0000 Subject: [PATCH] - Update to version 1.015: * Add hypnotoad service (#217) * Log statistics the old way * Add stress tests * Add indices on sync_requested and scan_requested to avoid deadlock * Allow hash.mtime differ for up to 1 min * Rework estimation of inactive jobs count OBS-URL: https://build.opensuse.org/package/show/openSUSE:infrastructure:MirrorCache/MirrorCache?expand=0&rev=34 --- MirrorCache-1.014.obscpio | 3 --- MirrorCache-1.015.obscpio | 3 +++ MirrorCache-tmpfilesd.conf | 1 + MirrorCache-user.conf | 1 + MirrorCache.changes | 11 +++++++++++ MirrorCache.obsinfo | 6 +++--- MirrorCache.spec | 11 ++++++++--- 7 files changed, 27 insertions(+), 9 deletions(-) delete mode 100644 MirrorCache-1.014.obscpio create mode 100644 MirrorCache-1.015.obscpio diff --git a/MirrorCache-1.014.obscpio b/MirrorCache-1.014.obscpio deleted file mode 100644 index a2c2529..0000000 --- a/MirrorCache-1.014.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c4a871b13a208fb394c3aaaa861dcb6c4080fe4e17cb960701796f9a213bb330 -size 748556 diff --git a/MirrorCache-1.015.obscpio b/MirrorCache-1.015.obscpio new file mode 100644 index 0000000..91eaff4 --- /dev/null +++ b/MirrorCache-1.015.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ebf9d1dc75c3ff89abef127dd8dcb2a7443d7d9550061eca47ecef903495355 +size 769036 diff --git a/MirrorCache-tmpfilesd.conf b/MirrorCache-tmpfilesd.conf index 1b80935..4bd77ff 100644 --- a/MirrorCache-tmpfilesd.conf +++ b/MirrorCache-tmpfilesd.conf @@ -1,2 +1,3 @@ # Type Path Mode UID GID Age Argument d /var/lib/mirrorcache 0750 mirrorcache mirrorcache - - +d /run/mirrorcache 0750 mirrorcache mirrorcache - - diff --git a/MirrorCache-user.conf b/MirrorCache-user.conf index 3afa289..f54acb8 100644 --- a/MirrorCache-user.conf +++ b/MirrorCache-user.conf @@ -1,2 +1,3 @@ # Type Name ID GECOS [HOME] u mirrorcache - "MirrorCache" /var/lib/mirrorcache +g mirrorcache diff --git a/MirrorCache.changes b/MirrorCache.changes index e3774a2..b30d6b9 100644 --- a/MirrorCache.changes +++ b/MirrorCache.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Oct 28 08:56:27 UTC 2021 - Andrii Nikitin + +- Update to version 1.015: + * Add hypnotoad service (#217) + * Log statistics the old way + * Add stress tests + * Add indices on sync_requested and scan_requested to avoid deadlock + * Allow hash.mtime differ for up to 1 min + * Rework estimation of inactive jobs count + ------------------------------------------------------------------- Thu Oct 21 06:57:03 UTC 2021 - Andrii Nikitin diff --git a/MirrorCache.obsinfo b/MirrorCache.obsinfo index 7b527f8..25d714b 100644 --- a/MirrorCache.obsinfo +++ b/MirrorCache.obsinfo @@ -1,5 +1,5 @@ name: MirrorCache -version: 1.014 -mtime: 1634655073 -commit: bd31badfdc3b28b2a2d7dadf13346a4a7e06fdac +version: 1.015 +mtime: 1635411259 +commit: 7e0fe69144b170e6479f90056a4ba034b7f3a5a6 diff --git a/MirrorCache.spec b/MirrorCache.spec index 1031b94..601de76 100644 --- a/MirrorCache.spec +++ b/MirrorCache.spec @@ -16,12 +16,13 @@ # -%define mirrorcache_services mirrorcache.service mirrorcache-backstage.service mirrorcache-backstage-hashes.service mirrorcache-subtree.service +%define mirrorcache_services_restart mirrorcache.service mirrorcache-backstage.service mirrorcache-backstage-hashes.service mirrorcache-subtree.service +%define mirrorcache_services %{mirrorcache_services_restart} mirrorcache-hypnotoad.service %define assetpack_requires perl(CSS::Minifier::XS) >= 0.01 perl(JavaScript::Minifier::XS) >= 0.11 perl(Mojolicious::Plugin::AssetPack) >= 1.36 perl(IO::Socket::SSL) %define main_requires %{assetpack_requires} perl(Carp) perl(DBD::Pg) >= 3.7.4 perl(DBI) >= 1.632 perl(DBIx::Class) >= 0.082801 perl(DBIx::Class::DynamicDefault) perl(DateTime) perl(Encode) perl(Time::Piece) perl(Time::Seconds) perl(Time::ParseDate) perl(DateTime::Format::Pg) perl(Exporter) perl(File::Basename) perl(LWP::UserAgent) perl(Mojo::Base) perl(Mojo::ByteStream) perl(Mojo::IOLoop) perl(Mojo::JSON) perl(Mojo::Pg) perl(Mojo::URL) perl(Mojo::Util) perl(Mojolicious::Commands) perl(Mojolicious::Plugin) perl(Mojolicious::Plugin::RenderFile) perl(Mojolicious::Static) perl(Net::OpenID::Consumer) perl(POSIX) perl(Sort::Versions) perl(URI::Escape) perl(XML::Writer) perl(base) perl(constant) perl(diagnostics) perl(strict) perl(warnings) shadow rubygem(sass) perl(Net::DNS) perl(LWP::Protocol::https) perl(Digest::SHA) %define build_requires %{assetpack_requires} rubygem(sass) tidy sysuser-shadow sysuser-tools Name: MirrorCache -Version: 1.014 +Version: 1.015 Release: 0 Summary: WebApp to redirect and manage mirrors License: GPL-2.0-or-later @@ -56,6 +57,7 @@ Mirror redirector web service, which automatically scans the main server and mir # DEST_DIR={_datadir} mkdir -p %{buildroot}%{_sbindir} ln -s ../sbin/service %{buildroot}%{_sbindir}/rcmirrorcache +ln -s ../sbin/service %{buildroot}%{_sbindir}/rcmirrorcache-hypnotoad ln -s ../sbin/service %{buildroot}%{_sbindir}/rcmirrorcache-backstage ln -s ../sbin/service %{buildroot}%{_sbindir}/rcmirrorcache-backstage-hashes ln -s ../sbin/service %{buildroot}%{_sbindir}/rcmirrorcache-subtree @@ -73,12 +75,14 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_tmpfilesdir}/%{name}.conf %service_del_preun %{mirrorcache_services} %postun -%service_del_postun %{mirrorcache_services} +%service_del_postun %{mirrorcache_services_restart} +%service_del_postun_without_restart mirrorcache-hypnotoad.service %files %doc README.asciidoc %license LICENSE %{_sbindir}/rcmirrorcache +%{_sbindir}/rcmirrorcache-hypnotoad %{_sbindir}/rcmirrorcache-backstage %{_sbindir}/rcmirrorcache-backstage-hashes %{_sbindir}/rcmirrorcache-subtree @@ -89,6 +93,7 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_tmpfilesdir}/%{name}.conf # init %dir %{_unitdir} %{_unitdir}/mirrorcache.service +%{_unitdir}/mirrorcache-hypnotoad.service %{_unitdir}/mirrorcache-backstage.service %{_unitdir}/mirrorcache-backstage-hashes.service %{_unitdir}/mirrorcache-subtree.service