hachi · molele2 · Nov 22, 2011 · Nov 22, 2011 · Nov 23, 2011 · Nov 23, 2011
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+Makefile
+blib
+pm_to_blib
diff --git a/.shipit b/.shipit
@@ -1,4 +1,4 @@
 steps = FindVersion, ChangeVersion, CheckChangeLog, DistTest, Commit, Tag, MakeDist, UploadCPAN
 
-svn.tagpattern = mogilefs-server-%v
+git.tagpattern = %v
 
diff --git a/CHANGES b/CHANGES
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1 @@
+License granted to use/distribute under the same terms as Perl itself.
diff --git a/MANIFEST b/MANIFEST
@@ -1,56 +1,23 @@
 CHANGES
+LICENSE
+examples/testapp/testapp-perlbal.conf
+examples/testapp/testapp.psgi
+examples/testapp/README
 doc/fsck-notes.txt
 doc/memcache-support.txt
 doc/pluggable-replication-policies.txt
 doc/testing.txt
-lib/mogdeps/Danga/Socket.pm
-lib/mogdeps/Net/Netmask.pm
-lib/mogdeps/Perlbal.pm
-lib/mogdeps/Perlbal/AIO.pm
-lib/mogdeps/Perlbal/BackendHTTP.pm
-lib/mogdeps/Perlbal/Cache.pm
-lib/mogdeps/Perlbal/ChunkedUploadState.pm
-lib/mogdeps/Perlbal/ClientHTTP.pm
-lib/mogdeps/Perlbal/ClientHTTPBase.pm
-lib/mogdeps/Perlbal/ClientManage.pm
-lib/mogdeps/Perlbal/ClientProxy.pm
-lib/mogdeps/Perlbal/CommandContext.pm
-lib/mogdeps/Perlbal/HTTPHeaders.pm
-lib/mogdeps/Perlbal/ManageCommand.pm
-lib/mogdeps/Perlbal/Plugin/AccessControl.pm
-lib/mogdeps/Perlbal/Plugin/AutoRemoveLeadingDir.pm
-lib/mogdeps/Perlbal/Plugin/Highpri.pm
-lib/mogdeps/Perlbal/Plugin/NotModified.pm
-lib/mogdeps/Perlbal/Plugin/Queues.pm
-lib/mogdeps/Perlbal/Plugin/Stats.pm
-lib/mogdeps/Perlbal/Plugin/Vhosts.pm
-lib/mogdeps/Perlbal/Plugin/AtomInject.pm
-lib/mogdeps/Perlbal/Plugin/AtomStream.pm
-lib/mogdeps/Perlbal/Plugin/Cgilike.pm
-lib/mogdeps/Perlbal/Plugin/EchoService.pm
-lib/mogdeps/Perlbal/Plugin/Include.pm
-lib/mogdeps/Perlbal/Plugin/LazyCDN.pm
-lib/mogdeps/Perlbal/Plugin/MaxContentLength.pm
-lib/mogdeps/Perlbal/Plugin/Palimg.pm
-lib/mogdeps/Perlbal/Plugin/Redirect.pm
-lib/mogdeps/Perlbal/Plugin/Vpaths.pm
-lib/mogdeps/Perlbal/Pool.pm
-lib/mogdeps/Perlbal/ReproxyManager.pm
-lib/mogdeps/Perlbal/Service.pm
-lib/mogdeps/Perlbal/Socket.pm
-lib/mogdeps/Perlbal/TCPListener.pm
-lib/mogdeps/Perlbal/Test.pm
-lib/mogdeps/Perlbal/Test/WebClient.pm
-lib/mogdeps/Perlbal/Test/WebServer.pm
-lib/mogdeps/Perlbal/UploadListener.pm
-lib/mogdeps/Perlbal/Util.pm
-lib/mogdeps/Perlbal/SocketSSL.pm
-lib/mogdeps/Sys/Syscall.pm
+doc/checksums.txt
+lib/MogileFS/Checksum.pm
 lib/MogileFS/Class.pm
 lib/MogileFS/Config.pm
 lib/MogileFS/Connection/Client.pm
+lib/MogileFS/Connection/HTTP.pm
 lib/MogileFS/Connection/Mogstored.pm
+lib/MogileFS/Connection/Parent.pm
+lib/MogileFS/Connection/Poolable.pm
 lib/MogileFS/Connection/Worker.pm
+lib/MogileFS/ConnectionPool.pm
 lib/MogileFS/DevFID.pm
 lib/MogileFS/Device.pm
 lib/MogileFS/DeviceState.pm
@@ -62,7 +29,9 @@ lib/MogileFS/HTTPFile.pm
 lib/MogileFS/IOStatWatcher.pm
 lib/MogileFS/Overview.pm
 lib/MogileFS/ProcManager.pm
+lib/MogileFS/Rebalance.pm
 lib/MogileFS/ReplicationPolicy.pm
+lib/MogileFS/ReplicationPolicy/MultipleDevices.pm
 lib/MogileFS/ReplicationPolicy/MultipleHosts.pm
 lib/MogileFS/ReplicationPolicy/Union.pm
 lib/MogileFS/ReplicationRequest.pm
@@ -71,9 +40,13 @@ lib/MogileFS/Store.pm
 lib/MogileFS/Store/MySQL.pm
 lib/MogileFS/Store/Postgres.pm
 lib/MogileFS/Store/SQLite.pm
-lib/MogileFS/Sys.pm
 lib/MogileFS/Test.pm
 lib/MogileFS/Util.pm
+lib/MogileFS/Factory.pm
+lib/MogileFS/Factory/Domain.pm
+lib/MogileFS/Factory/Class.pm
+lib/MogileFS/Factory/Host.pm
+lib/MogileFS/Factory/Device.pm
 lib/MogileFS/Worker.pm
 lib/MogileFS/Worker/Delete.pm
 lib/MogileFS/Worker/Fsck.pm
@@ -88,27 +61,40 @@ lib/Mogstored/ChildProcess/IOStat.pm
 lib/Mogstored/FIDStatter.pm
 lib/Mogstored/HTTPServer.pm
 lib/Mogstored/HTTPServer/Apache.pm
+lib/Mogstored/HTTPServer/Nginx.pm
 lib/Mogstored/HTTPServer/Lighttpd.pm
 lib/Mogstored/HTTPServer/Perlbal.pm
 lib/Mogstored/HTTPServer/None.pm
 lib/Mogstored/SideChannelClient.pm
 lib/Mogstored/SideChannelListener.pm
+lib/Mogstored/TaskQueue.pm
 Makefile.PL
 MANIFEST
 mogautomount
 mogdbsetup
 mogilefsd
 mogstored
 t/00-startup.t
+t/01-domain-class.t
+t/02-host-device.t
 t/10-weighting.t
 t/20-filepaths.t
-t/domains-classes.t
+t/30-rebalance.t
+t/40-httpfile.t
+t/50-checksum.t
+t/51-checksum_class_change.t
+t/60-fsck.t
+t/70-reaper.t
+t/80-job_master.t
+t/checksum.t
 t/fid-stat.t
-t/hosts-devices.t
+t/http.t
 t/mogstored-shutdown.t
+t/multiple-devices-replpol.t
 t/multiple-hosts-replpol.t
 t/replpolicy-parsing.t
 t/replpolicy.t
+t/store-sqlite.t
 t/store.t
 t/util.t
 TODO

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
@@ -14,6 +14,7 @@ _blib$
 \bdebian\b
 \bconf\b
 \.svn
+\.git
 dev-killmogstored.sh
 make-par.sh
 mogstored.pp

diff --git a/Makefile.PL b/Makefile.PL
@@ -16,14 +16,14 @@ $exefiles = ["mogstored"] if exists $ENV{DANGABUILD_MOGSTOREDONLY};
 $exefiles = ["mogilefsd"] if exists $ENV{DANGABUILD_MOGILEFSDONLY};
 
 WriteMakefile(
-    NAME                    => 'mogilefs-server',
+    NAME                    => 'MogileFS::Server',
     VERSION_FROM            => 'lib/MogileFS/Server.pm',
     AUTHOR                  => 'Brad Fitzpatrick <[email protected]>',
     ABSTRACT_FROM           => 'lib/MogileFS/Server.pm',
     EXE_FILES               => $exefiles,
     PREREQ_PM               => {
         'Danga::Socket'    => '1.56',
-        'Perlbal'          => '1.76',
+        'Perlbal'          => '1.79',
         'Sys::Syslog'      => 0,
         'Sys::Syscall'     => '0.22',
         'Getopt::Long'     => 0,
@@ -33,17 +33,17 @@ WriteMakefile(
         'IO::AIO'         => 0,
         'MogileFS::Client' => 0,
         DBI                => 0,
+        'Test::More'        => 0.88,    # 0.88 for done_testing() support
     },
     META_MERGE              => {
         no_index => {
-            directory => 'lib/mogdeps',
             package   => ['ProcessHandle', 'TrackerHandle', 'MogstoredHandle',
             'MogPath', 'Mgd'],
         },
           resources => {
-            homepage    =>      'http://danga.com/mogilefs/',
-            bugtracker  =>      'http://rt.cpan.org/Public/Dist/Display.html?Name=mogilefs-server',
-            repository  =>      'http://code.sixapart.com/svn/mogilefs/',
+            homepage    =>      'http://www.mogilefs.org',
+            bugtracker  =>      'http://code.google.com/p/mogilefs/issues/list',
+            repository  =>      'git://github.com/mogilefs/MogileFS-Server.git',
             MailingList =>      'http://groups.google.com/group/mogile',
         },
 

diff --git a/MogileFS-Server.spec b/MogileFS-Server.spec
@@ -2,15 +2,15 @@
 
 name:      MogileFS-Server
 summary:   MogileFS-Server - MogileFS Server daemons and utilities.
-version:   2.36
+version:   2.46
 release:   2%{?dist}
 vendor:    Alan Kasindorf <[email protected]>
 packager:  Jonathan Steinert <[email protected]>
 license:   Artistic
 group:     Applications/CPAN
 buildroot: %{_tmppath}/%{name}-%{version}-%(id -u -n)
 buildarch: noarch
-source:    mogilefs-server-%{version}.tar.gz
+source:    MogileFS-Server-%{version}.tar.gz
 autoreq:   no
 requires:  MogileFS-Server-mogilefsd = %{version}-%{release}
 requires:  MogileFS-Server-mogstored = %{version}-%{release}
@@ -26,10 +26,10 @@ This is a dummy package which depends on all the others so you can install them
 
 %prep
 rm -rf "%{buildroot}"
-%setup -n mogilefs-server-%{version}
+%setup -n MogileFS-Server-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX=%{buildroot}%{_prefix}
+%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX=%{buildroot}%{_prefix} INSTALL_BASE=
 make all
 make test
 
@@ -38,10 +38,6 @@ make pure_install
 
 [ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
 
-# remove mogdeps and related files
-rm -rf %{buildroot}/%{perl_vendorlib}/mogdeps
-rm -f %{buildroot}/usr/share/man/man3/mogdeps::*
-
 # remove special files
 find %{buildroot} \(                    \
        -name "perllocal.pod"            \

diff --git a/TESTING b/TESTING
@@ -10,12 +10,13 @@ Testing under Postgresql:
 -------------------------
 Database setup:
 # createuser -SRlD mogile
-# createdb -E UTF8 -O mogile tmp_mogiletest
+# createdb --template template0 -E UTF8 -O mogile tmp_mogiletest
 
 To run the tests:
 # make test \
 	MOGTEST_DBUSER=mogile \
 	MOGTEST_DBNAME=tmp_mogiletest \
+	MOGTEST_DBROOTUSER=postgres \
 	MOGTEST_DBTYPE=Postgres
 
 Testing under SQLite:
@@ -24,3 +25,22 @@ Testing under SQLite:
 	MOGTEST_DBUSER=mogile \
 	MOGTEST_DBNAME=tmp_mogiletest \
 	MOGTEST_DBTYPE=SQLite
+
+Available test variables:
+-------------------------
+MOGTEST_DBNAME
+MOGTEST_DBTYPE
+MOGTEST_DBUSER
+MOGTEST_DBPASS
+MOGTEST_DBROOTUSER
+MOGTEST_DBROOTPASS
+
+Other use test notes:
+---------------------
+- Running the tests should be done with equally new versions of MogileFS-Utils
+  and perl-MogileFS-Client. If you have all 3 git repos checked out in
+  parallel, set:
+  "PATH=../MogileFS-Utils/:$PATH PERL5LIB=../perl-MogileFS-Client/lib" 
+- You can control the disk space used for the test mogstored's by setting
+  TMPDIR.
+
diff --git a/conf/mogilefsd.conf b/conf/mogilefsd.conf
@@ -1,4 +1,7 @@
-#daemonize = 1
+# Enable daemon mode to work in background and use syslog
+daemonize = 1
+# Where to store the pid of the daemon (must be the same in the init script)
+pidfile = /var/run/mogilefsd/mogilefsd.pid
 # Database connection information
 db_dsn = DBI:mysql:mogilefs:host=127.0.0.1
 db_user = username

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,65 @@
+mogilefs-server (2.44-1) stable; urgency=low
+
+  * pull from upstream
+
+ -- Dormando <[email protected]>  Thu, 23 Dec 2010 21:58:49 -0800
+
+mogilefs-server (2.43-1) stable; urgency=low
+
+  * pulled 2.43 from github which includes fixes from 2.42-1
+  * added pidfile entry to default mogilefsd.conf to fix pidfile creation bug
+  * added daemon = 1 to default mogilefsd.conf to make mogilefsd use syslog
+
+ -- Andre Pascha <[email protected]>  Mon, 11 Oct 2010 10:21:27 +0200
+
+mogilefs-server (2.42-1kwick2) stable; urgency=low
+
+  * added fixes for over replicated files of todays github pull
+  * include mindevcount=1 fixes
+
+ -- Andre Pascha <[email protected]>  Sun, 10 Oct 2010 14:34:25 +0200
+
+mogilefs-server (2.42-1kwick1) stable; urgency=low
+
+  * git pull of today
+  * includes fix from Andre Pascha to make FSCK work again
+
+ -- Andre Pascha <[email protected]>  Sat, 09 Oct 2010 18:12:18 +0200
+
+mogilefs-server (2.41-1kwick3) stable; urgency=low
+
+  * fixed problem with wrong permissions on mogilefsd pid file
+
+ -- Andre Pascha <[email protected]>  Fri, 08 Oct 2010 17:43:44 +0200
+
+mogilefs-server (2.41-1kwick2) stable; urgency=low
+
+  * added pid directory to mogstored/mogilefsd. fixes problem with stopping
+    the daemon via init skript when daemon is set to 1 in the config.  Daemon
+    needs to be set to 1 or syslogging won't be enabled.
+
+ -- Andre Pascha <[email protected]>  Fri, 08 Oct 2010 17:33:11 +0200
+
+mogilefs-server (2.41-1kwick1) stable; urgency=low
+
+  * moved to github version of MogileFS-Server
+  * package versioning now coresponds to mogilefs version
+
+ -- Andre Pascha <[email protected]>  Fri, 08 Oct 2010 16:59:33 +0200
+
+mogilefs-server (1.00-2kwick2) stable; urgency=low
+
+  * added dependency to Danga::Socket for mogostored
+
+ -- Andre Pascha <[email protected]>  Fri, 08 Oct 2010 15:29:46 +0200
+
+mogilefs-server (1.00-2kwick1) stable; urgency=low
+
+  * Non-maintainer upload.
+  * SVN snapshot of 06 Oct 2010
+
+ -- Andre Pascha <[email protected]>  Thu, 07 Oct 2010 17:26:01 +0200
+
 mogilefs-server (1.00-2) unstable; urgency=low
 
   * fix data loss bug when the 'tempfile' table is InnoDB and the

diff --git a/debian/control b/debian/control
@@ -2,20 +2,20 @@ Source: mogilefs-server
 Section: perl
 Priority: optional
 Maintainer: Jonathan Steinert <[email protected]>
-Build-Depends-Indep: libstring-crc32-perl
+Build-Depends-Indep: debhelper (>= 4.1.40), perl (>= 5.6.0-16), libstring-crc32-perl
 Standards-Version: 3.6.1.0
 
 Package: mogstored
 Architecture: all
-Depends: ${perl:Depends}, debhelper (>= 4.1.40), libperlbal-perl, libio-aio-perl, debconf (>= 1.2.0)
+Depends: ${perl:Depends}, libperlbal-perl (>= 1.79), libio-aio-perl, debconf (>= 1.2.0), sysstat
 Suggests: mogilefs-utils
 Description: storage node daemon for MogileFS
  Mogstored is a storage node daemon for MogileFS, the open-source
  application-level distributed filesystem from Danga Interactive.
 
 Package: mogilefsd
 Architecture: all
-Depends: ${perl:Depends}, debhelper (>= 4.1.40), libdbd-mysql-perl, libdbi-perl, debconf (>= 1.2.0), libnet-netmask-perl, libwww-perl
+Depends: ${perl:Depends}, libdbd-mysql-perl, libdbi-perl, debconf (>= 1.2.0), libnet-netmask-perl, libwww-perl, libdanga-socket-perl
 Suggests: mogilefs-utils
 Description: scalable distributed filesystem from Danga Interactive
  MogileFS is an open-source, application-level distributed filesystem. It