Compare commits
3 Commits
| Author | SHA1 | Date |
|---|---|---|
David Nalley
|
dd9aeea8c1 | |
|
David Nalley
|
0c05d27c84 | |
|
David Nalley
|
3686e98729 |
|
|
@ -1,5 +1,2 @@
|
|||
*.rpm
|
||||
/sheepdog-0.2.3.tar.gz
|
||||
/sheepdog-0.2.4.tar.gz
|
||||
/collie-sheepdog-v0.3.0-0-gbb41896.tar.gz
|
||||
/v1.0.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
cpg_dispatch requires 0x101568 bytes of stack.
|
||||
|
||||
diff --git a/lib/coroutine.c b/lib/coroutine.c
|
||||
index 5b2ed79..1e1060c 100644
|
||||
--- a/lib/coroutine.c
|
||||
+++ b/lib/coroutine.c
|
||||
@@ -52,7 +52,7 @@ enum co_action {
|
||||
#define POOL_MAX_SIZE 64
|
||||
#endif
|
||||
|
||||
-#define STACK_MAX_SIZE (1 << 20) /* 1 MB */
|
||||
+#define STACK_MAX_SIZE (2 << 20) /* 1 MB */
|
||||
|
||||
struct coroutine {
|
||||
coroutine_entry_func_t *entry;
|
||||
11
sheepdog
11
sheepdog
|
|
@ -1,11 +0,0 @@
|
|||
# use stdout for journal; other possibilities include "default" and "syslog"
|
||||
SHEEPDOG_LOGDEST=stdout
|
||||
SHEEPDOG_LOGLEVEL=info
|
||||
SHEEPDOG_LOGFMT=default
|
||||
|
||||
SHEEPDOG_PORT=7000
|
||||
|
||||
# --no-sync, --directio, --gateway, --journal, --wq-threads, ...
|
||||
SHEEPDOG_EXTRA_OPTS=
|
||||
|
||||
SHEEPDOG_PATH=/var/lib/sheepdog
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
[Unit]
|
||||
Description=Sheepdog QEMU/KVM Block Storage
|
||||
After=network.target
|
||||
Requires=corosync.service
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=/etc/sysconfig/sheepdog
|
||||
ExecStart=/usr/sbin/sheep -f --log level=${SHEEPDOG_LOGLEVEL},dst=${SHEEPDOG_LOGDEST},format=${SHEEPDOG_LOGFMT} $SHEEPDOG_EXTRA_OPTS ${SHEEPDOG_PATH}
|
||||
Restart=on-failure
|
||||
RestartSec=2s
|
||||
LimitNOFILE=32768
|
||||
|
||||
# Use sheepdog.timer instead. Because corosync does not provide
|
||||
# notification via sd_notify, we introduce an arbitrary delay between
|
||||
# starting corosync.service and starting sheepdog.
|
||||
|
||||
#[Install]
|
||||
#WantedBy=multi-user.target
|
||||
186
sheepdog.spec
186
sheepdog.spec
|
|
@ -1,191 +1,81 @@
|
|||
Name: sheepdog
|
||||
Summary: The Sheepdog distributed storage system for KVM/QEMU
|
||||
Version: 1.0.1
|
||||
Release: 8%{?dist}
|
||||
Summary: The Sheepdog Distributed Storage System for KVM/QEMU
|
||||
Version: 0.2.4
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2 and GPLv2+
|
||||
Group: System Environment/Base
|
||||
URL: http://sheepdog.github.io/sheepdog
|
||||
Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz
|
||||
Source1: sheepdog.service
|
||||
Source2: sheepdog.timer
|
||||
Source3: sheepdog
|
||||
URL: http://www.osrg.net/sheepdog
|
||||
Source0: http://downloads.sourceforge.net/project/sheepdog/%{name}/%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
%{?systemd_requires}
|
||||
# Runtime bits
|
||||
Requires: corosync
|
||||
Requires(post): chkconfig
|
||||
Requires(preun): chkconfig
|
||||
Requires(preun): initscripts
|
||||
|
||||
# Build bits
|
||||
BuildRequires: autoconf automake libtool systemd
|
||||
BuildRequires: autoconf automake
|
||||
BuildRequires: corosync corosynclib corosynclib-devel
|
||||
BuildRequires: userspace-rcu-devel
|
||||
|
||||
# For sheepfs
|
||||
BuildRequires: fuse-devel
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
%ifarch x86_64
|
||||
BuildRequires: yasm
|
||||
%endif
|
||||
|
||||
# corosync not available on these architectures
|
||||
%if 0%{?rhel} >= 6
|
||||
Excludearch: aarch64
|
||||
Excludearch: ppc
|
||||
Excludearch: ppc64
|
||||
Excludearch: ppc64le
|
||||
%endif
|
||||
|
||||
|
||||
|
||||
%description
|
||||
This package contains the Sheepdog server and the "dog" command line tool,
|
||||
which offer a distributed object storage system for KVM.
|
||||
|
||||
%package devel
|
||||
Summary: Header files for the Sheepdog distributed storage system
|
||||
Group: Development/Libraries
|
||||
License: GPLv2 and GPLv2+
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
This package contains the header files for libsheepdog.
|
||||
|
||||
%package libs
|
||||
Summary: Libraries for the Sheepdog distributed storage system
|
||||
Group: Applications/File
|
||||
License: GPLv2 and GPLv2+
|
||||
|
||||
%description libs
|
||||
This package contains the libsheepdog shared library.
|
||||
This package contains the Sheepdog server, and command line tool which offer
|
||||
a distributed object storage system for KVM.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -qn collie-sheepdog-bc0ab52
|
||||
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
%{configure} --with-initddir=%{_initrddir}
|
||||
|
||||
# TODO: add LTTng-ust support
|
||||
%{configure} \
|
||||
--without-initddir \
|
||||
--without-systemdsystemunitdir \
|
||||
--disable-static
|
||||
|
||||
make %{_smp_mflags} V=1
|
||||
|
||||
make %{_smp_mflags}
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
make install DESTDIR=%{buildroot}
|
||||
rm -f %{buildroot}/%{_libdir}/libsheepdog.la
|
||||
rm -f %{buildroot}/%{_libdir}/libsheepdog.a
|
||||
|
||||
mkdir -p %{buildroot}/%{_unitdir}
|
||||
cp -a %{SOURCE1} %{buildroot}/%{_unitdir}/
|
||||
cp -a %{SOURCE2} %{buildroot}/%{_unitdir}/
|
||||
## tree fixup
|
||||
# drop static libs
|
||||
rm -f %{buildroot}%{_libdir}/*.a
|
||||
|
||||
mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig
|
||||
cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post
|
||||
%systemd_post sheepdog.timer
|
||||
/sbin/chkconfig --add sheepdog
|
||||
|
||||
%preun
|
||||
%systemd_preun sheepdog.timer
|
||||
if [ $1 -eq 0 ] ; then
|
||||
/sbin/service sheepdog stop >/dev/null 2>&1
|
||||
/sbin/chkconfig --del sheepdog
|
||||
fi
|
||||
|
||||
%postun
|
||||
%systemd_postun_with_restart sheepdog.timer
|
||||
if [ "$1" -ge "1" ] ; then
|
||||
/sbin/service sheepdog condrestart >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
|
||||
%files
|
||||
%doc COPYING README
|
||||
%{_bindir}/dog
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING README INSTALL
|
||||
%{_sbindir}/sheep
|
||||
%{_sbindir}/sheepfs
|
||||
%{_sbindir}/shepherd
|
||||
%{_sysconfdir}/bash_completion.d/dog
|
||||
|
||||
%{_unitdir}/sheepdog.service
|
||||
%{_unitdir}/sheepdog.timer
|
||||
%config %{_sysconfdir}/sysconfig/sheepdog
|
||||
|
||||
%{_sbindir}/collie
|
||||
%attr(755,-,-)%config %{_initddir}/sheepdog
|
||||
%dir %{_localstatedir}/lib/sheepdog
|
||||
%{_mandir}/man8/sheep.8*
|
||||
%{_mandir}/man8/dog.8*
|
||||
%{_mandir}/man8/sheepfs.8*
|
||||
|
||||
%files devel
|
||||
%dir %{_includedir}/sheepdog
|
||||
%{_includedir}/sheepdog/internal.h
|
||||
%{_includedir}/sheepdog/list.h
|
||||
%{_includedir}/sheepdog/sheepdog.h
|
||||
%{_includedir}/sheepdog/sheepdog_proto.h
|
||||
%{_includedir}/sheepdog/util.h
|
||||
|
||||
%files libs
|
||||
%{_libdir}/libsheepdog.so
|
||||
|
||||
%changelog
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Mar 22 2018 Kevin Fenzi <kevin@scrye.com> - 1.0.1-7
|
||||
- Rebuild for new corosync. Fixes bug #1559672
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Jan 09 2017 Paolo Bonzini <pbonzini@redhat.com> - 1.0.1-2
|
||||
- Introduce sheepdog.timer
|
||||
- For EPEL7, disable on aarch64
|
||||
|
||||
* Mon Jan 09 2017 Paolo Bonzini <pbonzini@redhat.com> - 1.0.1-1
|
||||
- Update to 1.0.1 (Resolves: #1396430)
|
||||
- /usr/bin/collie is now /usr/bin/dog
|
||||
- Added /usr/sbin/sheepfs and /usr/sbin/shepherd
|
||||
- Revamped systemd spec file, added /etc/sysconfig/sheepdog
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.0-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Thu Aug 21 2014 Kevin Fenzi <kevin@scrye.com> - 0.3.0-9
|
||||
- Rebuild for rpm bug 1131960
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sat Dec 21 2013 Ville Skyttä <ville.skytta@iki.fi> - 0.3.0-6
|
||||
- Drop empty %%postun script.
|
||||
- Drop INSTALL from docs.
|
||||
- Fix bogus date in %%changelog.
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Fri Mar 16 2012 Fabio M. Di Nitto <fdinitto@redhat.com> - 0.3.0-2
|
||||
- Rebuild against new corosync (soname change).
|
||||
- Add patch to fix build against new corosync headers.
|
||||
|
||||
* Thu Jan 12 2012 David Nalley <david@gnsa.us> - 0.3.0-1
|
||||
- updating to 0.3.0
|
||||
|
||||
* Thu Nov 24 2011 David Nalley <david@gnsa.us> - 0.2.4-2
|
||||
- adding systemd support
|
||||
|
||||
* Thu Nov 24 2011 David Nalley <david@gnsa.us> - 0.2.4-1
|
||||
- updating to 0.2.4
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
[Unit]
|
||||
Description=Sheepdog QEMU/KVM Block Storage
|
||||
After=network.target
|
||||
Requires=corosync.service
|
||||
|
||||
[Timer]
|
||||
OnActiveSec=2s
|
||||
AccuracySec=100ms
|
||||
Unit=sheepdog.service
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (v1.0.1.tar.gz) = fc8c90f9631a12032e380f7ad559e18859211df65c7b53a1cf4a64fcf5c85fb4e2f08a9fbb9330f0eb6e67e9848a885af10013bba5f8665f0e2864ea8770bcf8
|
||||
c4443ce1ee7d668f12fa959771131c31 sheepdog-0.2.4.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
diff -Naurd collie-sheepdog-bb41896.orig/sheep/cluster/corosync.c collie-sheepdog-bb41896/sheep/cluster/corosync.c
|
||||
--- collie-sheepdog-bb41896.orig/sheep/cluster/corosync.c 2011-12-28 18:03:36.000000000 +0100
|
||||
+++ collie-sheepdog-bb41896/sheep/cluster/corosync.c 2012-03-16 10:47:39.378340300 +0100
|
||||
@@ -196,9 +196,9 @@
|
||||
retry:
|
||||
ret = cpg_mcast_joined(cpg_handle, CPG_TYPE_AGREED, iov, iov_cnt);
|
||||
switch (ret) {
|
||||
- case CPG_OK:
|
||||
+ case CS_OK:
|
||||
break;
|
||||
- case CPG_ERR_TRY_AGAIN:
|
||||
+ case CS_ERR_TRY_AGAIN:
|
||||
dprintf("failed to send message: retrying\n");
|
||||
sleep(1);
|
||||
goto retry;
|
||||
@@ -632,7 +632,7 @@
|
||||
corosync_handlers = *handlers;
|
||||
|
||||
ret = cpg_initialize(&cpg_handle, &cb);
|
||||
- if (ret != CPG_OK) {
|
||||
+ if (ret != CS_OK) {
|
||||
eprintf("failed to initialize cpg (%d) - is corosync running?\n", ret);
|
||||
return -1;
|
||||
}
|
||||
@@ -659,7 +659,7 @@
|
||||
this_node.pid = getpid();
|
||||
|
||||
ret = cpg_fd_get(cpg_handle, &fd);
|
||||
- if (ret != CPG_OK) {
|
||||
+ if (ret != CS_OK) {
|
||||
eprintf("failed to get cpg file descriptor (%d)\n", ret);
|
||||
return -1;
|
||||
}
|
||||
@@ -681,13 +681,13 @@
|
||||
retry:
|
||||
ret = cpg_join(cpg_handle, &cpg_group);
|
||||
switch (ret) {
|
||||
- case CPG_OK:
|
||||
+ case CS_OK:
|
||||
break;
|
||||
- case CPG_ERR_TRY_AGAIN:
|
||||
+ case CS_ERR_TRY_AGAIN:
|
||||
dprintf("failed to join the sheepdog group: retrying\n");
|
||||
sleep(1);
|
||||
goto retry;
|
||||
- case CPG_ERR_SECURITY:
|
||||
+ case CS_ERR_SECURITY:
|
||||
eprintf("permission denied to join the sheepdog group\n");
|
||||
return -1;
|
||||
default:
|
||||
@@ -740,8 +740,8 @@
|
||||
{
|
||||
int ret;
|
||||
|
||||
- ret = cpg_dispatch(cpg_handle, CPG_DISPATCH_ALL);
|
||||
- if (ret != CPG_OK)
|
||||
+ ret = cpg_dispatch(cpg_handle, CS_DISPATCH_ALL);
|
||||
+ if (ret != CS_OK)
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
Loading…
Reference in New Issue