Skip to content
Permalink
Browse files

Staging 5.0

  • Loading branch information...
pkoutoupis committed Nov 25, 2016
1 parent d31d2e6 commit 140cdd0d53fa96b66d1ceea19461fe49f0a7f811
Showing with 281 additions and 12,799 deletions.
  1. +7 −0 CHANGELOG.md
  2. +4 −7 Makefile
  3. +9 −4 doc/rapiddisk.1
  4. +2 −2 module/Makefile
  5. +1 −1 module/dkms.conf
  6. +1 −14 module/rapiddisk.c
  7. +6 −0 pkg-mgmt/debian/changelog
  8. +4 −4 pkg-mgmt/debian/control
  9. +3 −3 pkg-mgmt/debian/postinst
  10. +1 −1 pkg-mgmt/debian/prerm
  11. +12 −11 pkg-mgmt/spec/rapiddisk.spec.opensuse
  12. +12 −11 pkg-mgmt/spec/{rapiddisk.spec.rhel → rapiddisk.spec.rhel6}
  13. +140 −0 pkg-mgmt/spec/rapiddisk.spec.rhel7+
  14. +6 −2 src/Makefile
  15. +1 −1 src/common.h
  16. +63 −0 src/core.c
  17. +9 −0 src/main.c
  18. +0 −6 www/.htaccess
  19. +0 −24 www/Makefile
  20. +0 −1 www/RapidDisk-API.json
  21. +0 −50 www/index.php
  22. +0 −624 www/lib/CHANGELOG
  23. +0 −621 www/lib/COPYING
  24. +0 −190 www/lib/audit.php
  25. +0 −241 www/lib/auth.php
  26. +0 −3,107 www/lib/base.php
  27. +0 −237 www/lib/basket.php
  28. +0 −96 www/lib/bcrypt.php
  29. +0 −1 www/lib/code.css
  30. +0 −385 www/lib/db/cursor.php
  31. +0 −150 www/lib/db/jig.php
  32. +0 −476 www/lib/db/jig/mapper.php
  33. +0 −189 www/lib/db/jig/session.php
  34. +0 −111 www/lib/db/mongo.php
  35. +0 −361 www/lib/db/mongo/mapper.php
  36. +0 −189 www/lib/db/mongo/session.php
  37. +0 −470 www/lib/db/sql.php
  38. +0 −633 www/lib/db/sql/mapper.php
  39. +0 −211 www/lib/db/sql/session.php
  40. +0 −42 www/lib/f3.php
  41. +0 −605 www/lib/image.php
  42. +0 −67 www/lib/log.php
  43. +0 −139 www/lib/magic.php
  44. +0 −577 www/lib/markdown.php
  45. +0 −108 www/lib/matrix.php
  46. +0 −189 www/lib/session.php
  47. +0 −307 www/lib/smtp.php
  48. +0 −350 www/lib/template.php
  49. +0 −96 www/lib/test.php
  50. +0 −199 www/lib/utf.php
  51. +0 −863 www/lib/web.php
  52. +0 −108 www/lib/web/geo.php
  53. +0 −65 www/lib/web/google/staticmap.php
  54. +0 −248 www/lib/web/openid.php
  55. +0 −177 www/lib/web/pingback.php
  56. +0 −96 www/rapiddisk.php
  57. +0 −129 www/restful-test.sh
@@ -1,3 +1,10 @@
### Release 5.0 ###

- kernel: Remove kernel mainline specific code (intended for brd replacement).
- kernel: Change spinlock types to work better with virtio (github issue #13).
- utility: Add JSON output for RapidDisk configuration (requires libjansson).
- www: remove fat-free (f3) RESTful API.

### Release 4.5 ###

- kernel: cache - Fixed I/O handler bug for 4.8+ kernels
@@ -1,4 +1,4 @@
SUBDIRS = src conf doc module test www
SUBDIRS = src conf doc module test

.PHONY: all
all:
@@ -24,15 +24,13 @@ dkms:
tools-install:
cd src; make; make install; \
cd ../conf; make install; \
cd ../doc; make install; \
cd ../www; make install; cd ..
cd ../doc; make install; cd ..

.PHONY: tools-uninstall
tools-uninstall:
cd src; make uninstall; \
cd ../conf; make uninstall; \
cd ../doc; make uninstall; \
cd ../www; make install; cd ..
cd ../doc; make uninstall; cd ..

.PHONY: nocrypt
nocrypt:
@@ -45,5 +43,4 @@ nocrypt-install:
cd src; make nocrypt-install; \
cd ../module; make install; \
cd ../conf; make install; \
cd ../doc; make install; \
cd ../www; make install; cd ..
cd ../doc; make install; cd ..
@@ -20,9 +20,12 @@ Dynamically attach new RapidDisk devices.
--detach
Dynamically detach RapidDisk devices.
.TP
--list
--list
List all attached RapidDisk devices.
.TP
--list-json
List all attached RapidDisk devices in JSON format (only if enabled during compilation).
.TP
--short-list
List all attached RapidDisk devices in script friendly format.
.TP
@@ -48,13 +51,13 @@ Map an RapidDisk device as a caching node to another block device.
Obtain RapidDisk-Cache Mappings statistics.
.TP
--enable-crypt
Initialize a storage volume for data encryption. Please store user defined keys in /etc/rapiddisk/key, otherwise it will default to the built-in DES key provided by the utility.
Initialize a storage volume for data encryption. Please store user defined keys in /etc/rapiddisk/key, otherwise it will default to the built-in DES key provided by the utility (only if enabled during compilation).
.TP
--activate-crypt
Activate an encryption volume. Please store user defined keys in /etc/rapiddisk/key, otherwise it will default to the built-in DES key provided by the utility.
Activate an encryption volume. Please store user defined keys in /etc/rapiddisk/key, otherwise it will default to the built-in DES key provided by the utility (only if enabled during compilation).
.TP
--deactivate-crypt
Deactivate an encrypted volume.
Deactivate an encrypted volume (only if enabled during compilation).
.SS Parameters (if applicable)
.TP
[size]
@@ -81,6 +84,8 @@ Write Through (wt) or Write Around (wa) for cache.
.TP
rapiddisk --list
.TP
rapiddisk --list-json
.TP
rapiddisk --attach 64
.TP
rapiddisk --detach rd2
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

VERSION = 4.5
VERSION = 5.0

ifeq ($(KSRC),)
KSRC := /lib/modules/$(shell uname -r)/build
@@ -29,7 +29,7 @@ obj-m += rapiddisk.o
obj-m += rapiddisk-cache.o

all:
KCPPFLAGS="-DNOTMAINLINE" $(MAKE) -C$(KSRC) M=$(PWD)
$(MAKE) -C$(KSRC) M=$(PWD)

install:
$(MKDIR) $(DESTDIR)/lib/modules/$(KVER)/kernel/drivers/block/
@@ -1,5 +1,5 @@
PACKAGE_NAME="rapiddisk"
PACKAGE_VERSION="4.5"
PACKAGE_VERSION="5.0"
BUILT_MODULE_NAME[0]="rapiddisk"
BUILT_MODULE_NAME[1]="rapiddisk-cache"
DEST_MODULE_LOCATION[0]="/kernel/rapiddisk/"
@@ -39,7 +39,7 @@
#include <linux/radix-tree.h>
#include <linux/io.h>

#define VERSION_STR "4.5"
#define VERSION_STR "5.0"
#define PREFIX "rapiddisk"
#define BYTES_PER_SECTOR 512
#define MAX_RDSKS 128
@@ -76,21 +76,8 @@ static int rd_max_nr = MAX_RDSKS;
static int max_sectors = DEFAULT_MAX_SECTS, nr_requests = DEFAULT_REQUESTS;
static LIST_HEAD(rdsk_devices);
static struct kobject *rdsk_kobj;
#ifndef NOTMAINLINE
#if CONFIG_BLK_DEV_RAM_COUNT
static int rd_nr = CONFIG_BLK_DEV_RAM_COUNT;
#else
static int rd_nr = 0;
#endif
#if CONFIG_BLK_DEV_RAM_SIZE
int rd_size = CONFIG_BLK_DEV_RAM_SIZE;
#else
int rd_size = 0;
#endif
#else
static int rd_nr = 0;
int rd_size = 0;
#endif

module_param(max_sectors, int, S_IRUGO);
MODULE_PARM_DESC(max_sectors, " Maximum sectors (in KB) for the request queue. (Default = 127)");
@@ -1,3 +1,9 @@
rapiddisk (5.0-1) released; urgency=medium

* kernel: Remove kernel mainline specific code (intended for brd replacement).
* utility: Add JSON output for RapidDisk configuration (requires libjansson).
* www: remove fat-free (f3) RESTful API.

rapiddisk (4.5-1) released; urgency=medium

* kernel: cache - Fixed I/O handler bug for 4.8+ kernels
@@ -1,13 +1,13 @@
Package: rapiddisk
Version: 4.5-1
Version: 5.0-1
Section: base
Priority: optional
Architecture: amd64
Depends: dkms, gcc, zlib1g, cryptsetup-luks, php5 | php, apache2 | httpd | lighttpd |tntnet
Depends: dkms, gcc, zlib1g, cryptsetup-luks, libjansson4
Maintainer: Petros Koutoupis <petros@petroskoutoupis.com>
Description: RapidDisk
The RapidDisk software defined advanced RAM drive and storage
caching solution. This suite includes a collection of modules,
configuration files, and command line utilities, and a RESTful
API for managing RapidDisk enabled storage volumes.
configuration files, and command line utilities for managing
RapidDisk enabled storage volumes.

@@ -16,9 +16,9 @@ fi
case "$1" in

configure)
dkms add -m rapiddisk -v 4.5
dkms build -m rapiddisk -v 4.5
dkms install -m rapiddisk -v 4.5
dkms add -m rapiddisk -v 5.0
dkms build -m rapiddisk -v 5.0
dkms install -m rapiddisk -v 5.0
echo "rapiddisk max_sectors=2048 nr_requests=1024" >> /etc/modules
echo "rapiddisk-cache" >> /etc/modules
echo "dm_mod" >> /etc/modules
@@ -14,7 +14,7 @@ fi

case "$1" in
remove|upgrade|deconfigure)
dkms remove -m rapiddisk -v 4.5 --all
dkms remove -m rapiddisk -v 5.0 --all
;;

failed-upgrade)
@@ -1,29 +1,29 @@
Summary: The RapidDisk software defined advanced RAM drive and storage caching solution.
Name: rapiddisk
Version: 4.5
Version: 5.0
Release: 1
License: General Public License Version 2
Group: Applications/System
Source: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: gcc,make,kernel-headers,kernel-devel,dkms,libcryptsetup4,httpd,php
BuildRequires: kernel-headers,kernel-devel,gcc,make,cryptsetup-devel,zlib-devel
Requires: gcc,make,kernel-headers,kernel-devel,dkms,libcryptsetup4,libjansson4
BuildRequires: kernel-headers,kernel-devel,gcc,make,cryptsetup-devel,zlib-devel,libjansson-devel

%description
The RapidDisk software defined advanced RAM drive and storage
caching solution. This suite includes a collection of modules,
configuration files, and command line utilities, and a RESTful
API for managing RapidDisk enabled storage volumes.
configuration files, and command line utilities for managing
RapidDisk enabled storage volumes.

%package utils
Summary: The RapidDisk administration utilities and API.
Summary: The RapidDisk administration utilities.
Group: Applications/System

%description utils
The RapidDisk software defined advanced RAM drive and storage
caching solution. This packages includes a collection of
configuration files, command line utilities, and a RESTful API
for managing RapidDisk enabled storage volumes.
configuration files, and command line utilities for managing
RapidDisk enabled storage volumes.

%prep
%setup -T -D -n rapiddisk
@@ -44,7 +44,6 @@ mkdir -pv %{buildroot}/usr/src/rapiddisk-%{version}/
cp -v dkms.conf %{buildroot}/usr/src/rapiddisk-%{version}/
cp -v {rapiddisk,rapiddisk-cache}.c %{buildroot}/usr/src/rapiddisk-%{version}/
cp -v Makefile %{buildroot}/usr/src/rapiddisk-%{version}/
cd ../www
make DESTDIR=%{buildroot}/ install

%post
@@ -74,17 +73,19 @@ rm -rf %{buildroot}
/etc/*
/sbin/*
/usr/src/rapiddisk-*
/var/www/html/*
%doc %attr(0444,root,root) /usr/share/man/man1/*

%files utils
%defattr(-,root,root)
/etc/*
/sbin/*
/var/www/html/*
%doc %attr(0444,root,root) /usr/share/man/man1/*

%changelog
* Fri Nov 25 2016 Petros Koutoupis <petros@petroskoutoupis.com>
- kernel: Remove kernel mainline specific code (intended for brd replacement).
- utility: Add JSON output for RapidDisk configuration (requires libjansson).
- www: remove fat-free (f3) RESTful API.
* Sat Nov 19 2016 Petros Koutoupis <petros@petroskoutoupis.com>
- kernel: cache - Fixed I/O handler bug for 4.8+ kernels
- documentation: Cleaned up formatting and license disclaimers (thanks Boian!)
@@ -1,29 +1,29 @@
Summary: The RapidDisk software defined advanced RAM drive and storage caching solution.
Name: rapiddisk
Version: 4.5
Version: 5.0
Release: 1
License: General Public License Version 2
Group: Applications/System
Source: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: gcc,make,kernel-headers,kernel-devel,dkms,cryptsetup-luks-libs,httpd,php
Requires: gcc,make,kernel-headers,kernel-devel,dkms,cryptsetup-luks-libs
BuildRequires: kernel-headers,kernel-devel,gcc,make,cryptsetup-luks-devel,zlib-devel

%description
The RapidDisk software defined advanced RAM drive and storage
caching solution. This suite includes a collection of modules,
configuration files, and command line utilities, and a RESTful
API for managing RapidDisk enabled storage volumes.
configuration files, and command line utilities for managing
RapidDisk enabled storage volumes.

%package utils
Summary: The RapidDisk administration utilities and API.
Summary: The RapidDisk administration utilities.
Group: Applications/System

%description utils
The RapidDisk software defined advanced RAM drive and storage
caching solution. This packages includes a collection of
configuration files, command line utilities, and a RESTful API
for managing RapidDisk enabled storage volumes.
configuration files, and command line utilities for managing
RapidDisk enabled storage volumes.

%prep
%setup -T -D -n rapiddisk
@@ -44,7 +44,6 @@ mkdir -pv %{buildroot}/usr/src/rapiddisk-%{version}/
cp -v dkms.conf %{buildroot}/usr/src/rapiddisk-%{version}/
cp -v {rapiddisk,rapiddisk-cache}.c %{buildroot}/usr/src/rapiddisk-%{version}/
cp -v Makefile %{buildroot}/usr/src/rapiddisk-%{version}/
cd ../www
make DESTDIR=%{buildroot}/ install

%post
@@ -74,17 +73,19 @@ rm -rf %{buildroot}
/etc/*
/sbin/*
/usr/src/rapiddisk-*
/var/www/html/*
%doc %attr(0444,root,root) /usr/share/man/man1/*

%files utils
%defattr(-,root,root)
/etc/*
/sbin/*
/var/www/html/*
%doc %attr(0444,root,root) /usr/share/man/man1/*

%changelog
* Fri Nov 25 2016 Petros Koutoupis <petros@petroskoutoupis.com>
- kernel: Remove kernel mainline specific code (intended for brd replacement).
- utility: Add JSON output for RapidDisk configuration (requires libjansson).
- www: remove fat-free (f3) RESTful API.
* Sat Nov 19 2016 Petros Koutoupis <petros@petroskoutoupis.com>
- kernel: cache - Fixed I/O handler bug for 4.8+ kernels
- documentation: Cleaned up formatting and license disclaimers (thanks Boian!)
@@ -100,7 +101,7 @@ rm -rf %{buildroot}
* Tue May 17 2016 Petros Koutoupis <petros@petroskoutoupis.com>
- kernel: Added Write-Around support to rapiddisk-cache.
- kernel: Fixed LINUX_VERSION check for rapiddisk-cache to accommodate changes in 3.8.3.
- utility: Added a NOCRYPT build flag.
- utility: Added a NOCRYPT build flag.
- utility: Added user definable keys for encryption setup.
* Tue May 10 2016 Petros Koutoupis <petros@petroskoutoupis.com>
- kernel: Readjusted misaligned discard request check to build on kernels older than 4.3.
Oops, something went wrong.

0 comments on commit 140cdd0

Please sign in to comment.
You can’t perform that action at this time.