Merge branch 'master' of https://github.com/BenningtonCS/GFS

BenningtonCS · Dec 3, 2013 · ef142d7 · ef142d7
2 parents 830ac1f + 12806b0
commit ef142d7
Show file tree

Hide file tree

Showing 32 changed files with 449 additions and 39 deletions.
diff --git a/API.pyc b/API.pyc
diff --git a/PackRatCofig.py b/PackRatCofig.py
@@ -0,0 +1,3 @@
+masterIp = '10.10.100.144'
+path = '/data/PackRat'
+
diff --git a/PackRatConfig.py b/PackRatConfig.py
@@ -0,0 +1,3 @@
+masterIp = '10.10.100.144'
+path = '/data/PackRat'
+
diff --git a/RAT b/RAT
@@ -0,0 +1,2 @@
+rawrawrawrrat
+
diff --git a/activehosts.txt b/activehosts.txt
@@ -1,5 +1,2 @@
-10.10.117.11
-10.10.117.14
 10.10.117.13
-10.10.117.12
-10.10.117.10
+10.10.117.14
diff --git a/cheesePull.sh b/cheesePull.sh
@@ -3,14 +3,14 @@
 
 
 
-if [ -f "/data/gfsbin/neededFiles.txt" ]
+if [ -f "/data/PackRat/neededFiles.txt" ]
 then
-	file="/data/gfsbin/neededFiles.txt"
+	file="/data/PackRat/neededFiles.txt"
 	while IFS= read -r line
 	do
 
 
-		scp -r [email protected]:$line /data/gfsbin
+		scp -r [email protected]:$line /data/PackRat
 		if [ "$line" ]
 		then
 			if [ -f $line ]

diff --git a/config.py b/config.py
@@ -5,7 +5,7 @@
 oplog = 'opLog.txt'
 port = 9666
 masterip = '10.10.100.144'
-chunkPath = '/data/gfsbin/Chunks'
+chunkPath = '/data/PackRat/Chunks'
 chunkSize = 12000 #bytes
 debug = False
 GFSoutput = "GFSoutPut/"

diff --git a/config.pyc b/config.pyc
diff --git a/database.pyc b/database.pyc
diff --git a/diff.py b/diff.py
@@ -1,6 +1,8 @@
 #! /usr/bin/env python
 
 import os
+import PackRatConfig as PRconfig
+
 
 def checkDiff(PL,SL):
 		li = []
@@ -15,8 +17,8 @@ def checkDiff(PL,SL):
 
 def main():
 
-	piman = open("/data/gfsbin/manifest.txt") 
-	servman = open("/data/temp/manifest.txt") 
+	piman = open(PRconfig.path+"/manifest.txt") 
+	servman = open(PRconfig.path+"/temp/manifest.txt") 
 
 	if piman.readline() == servman.readline():
 
@@ -27,8 +29,8 @@ def main():
 	piman.close()
 	servman.close()
 
-	piman = open("/data/gfsbin/manifest.txt") 
-	servman =  open("/data/temp/manifest.txt") 
+	piman = open(PRconfig.path+"/manifest.txt") 
+	servman =  open(PRconfig.path+"/temp/manifest.txt") 
 
 
 	piL = []
@@ -64,7 +66,7 @@ def main():
 			os.remove(c)
 			print "===>Deleted ", c ,"\n"
 
-	NewFi = open("/data/gfsbin/neededFiles.txt", "w")
+	NewFi = open(PRconfig.path+"/neededFiles.txt", "w")
 
 
 	for item in toPull:
@@ -79,7 +81,7 @@ def main():
 		NewFi.write(item)
 		NewFi.write("\n")
 
-	NewFi.write("/data/gfsbin/manifest.txt\n")
+	NewFi.write(PRconfig.path+"/manifest.txt\n")
 
 	piman.close()
 	servman.close()

diff --git a/functionLibrary.pyc b/functionLibrary.pyc
diff --git a/heartBeat.pyc b/heartBeat.pyc
diff --git a/hitlistC.txt b/hitlistC.txt
@@ -1 +1,4 @@
 /data/gfsbin/chunkserver.py
+/data/gfsbin/listener.py
+/data/gfsbin/httpServer.py
+/data/PackRat/httpServer.py
diff --git a/httpServerFiles/stats.txt b/httpServerFiles/stats.txt
@@ -0,0 +1 @@
+.
diff --git a/listener.pyc b/listener.pyc
diff --git a/listenerConfig.pyc b/listenerConfig.pyc
diff --git a/manifest.txt b/manifest.txt
diff --git a/manifetch.py b/manifetch.py
@@ -22,4 +22,4 @@
 	USER = USER[1].strip()
 
 # Securely copy the manifest from the master server to the /data/temp directory on the raspberry pi client
-os.system("scp " + USER + "@" + SERVER + ":/data/gfsbin/manifest.txt /data/temp/manifest.txt")
+os.system("scp " + USER + "@" + SERVER + ":/data/PackRat/manifest.txt /data/PackRat/temp/manifest.txt")
diff --git a/mgen/PackRatConfig.py b/mgen/PackRatConfig.py
@@ -0,0 +1,3 @@
+masterIp = '10.10.100.144'
+path = '/data/PackRat'
+
diff --git a/mgen/PackRatConfig.pyc b/mgen/PackRatConfig.pyc
diff --git a/mgen/mgen.py b/mgen/mgen.py
@@ -12,9 +12,9 @@
 
 import os
 import hashlib
-
+import PackRatConfig as PRconfig
 # Define the directory path mgen.py will work in
-GFS_PATH = "/data/gfsbin/"
+GFS_PATH = PRconfig.path+"/"
 
 # If the manifest file already exists in the defined path, get the version number from line 1 and store it
 # in memory, then remove the manifest
@@ -32,12 +32,19 @@
         a.write(NEW_VERSION + os.linesep)
 	# Look at all files and subdirectories in the defined directory and add them to the manifest
         for path, subdirs, files in os.walk(GFS_PATH):
-                for filename in files:
-                        f = os.path.join(path, filename)
-			# For all files that are not the manifest, create an md5 checksum
-                        if f != "/data/gfsbin/manifest.txt":
-                                hex = hashlib.md5(open(str(f)).read()).hexdigest()
-                                a.write(str(f) + "|" + hex + os.linesep)
+
+
+
+
+			for filename in files:
+
+                	        f = os.path.join(path, filename)
+
+				#print f
+				# For all files that are not the manifest, create an md5 checksum
+                       		if f != PRconfig.path+"/manifest.txt":
+                        	        hex = hashlib.md5(open(str(f)).read()).hexdigest()
+                               		a.write(str(f) + "|" + hex + os.linesep)
 
 # Create an md5 checksum for the manifest itself
 with open(GFS_PATH + "manifest.txt", "r") as a:

diff --git a/perfMon.py b/perfMon.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
-import os
+import os, logging
+
 
 disk = os.statvfs("/data")
 capacity = disk.f_bsize * disk.f_blocks

diff --git a/ps.txt b/ps.txt
@@ -0,0 +1,138 @@
+UID        PID  PPID  C STIME TTY          TIME CMD
+root         1     0  0  2012 ?        00:01:07 /sbin/init
+root         2     0  0  2012 ?        00:00:00 [kthreadd]
+root         3     2  0  2012 ?        00:11:10 [ksoftirqd/0]
+root         6     2 99  2012 ?        424-20:27:58 [migration/0]
+root         7     2  0  2012 ?        00:00:43 [watchdog/0]
+root         8     2 99  2012 ?        425-00:32:58 [migration/1]
+root        10     2  0  2012 ?        00:13:32 [ksoftirqd/1]
+root        12     2  0  2012 ?        00:00:20 [watchdog/1]
+root        13     2 99  2012 ?        425-02:00:58 [migration/2]
+root        15     2  0  2012 ?        00:15:08 [ksoftirqd/2]
+root        16     2  0  2012 ?        00:00:13 [watchdog/2]
+root        17     2 99  2012 ?        424-23:02:27 [migration/3]
+root        18     2  0  2012 ?        00:30:33 [kworker/3:0]
+root        19     2  0  2012 ?        00:17:00 [ksoftirqd/3]
+root        20     2  0  2012 ?        00:00:18 [watchdog/3]
+root        21     2  0  2012 ?        00:00:00 [cpuset]
+root        22     2  0  2012 ?        00:00:00 [khelper]
+root        23     2  0  2012 ?        00:00:00 [kdevtmpfs]
+root        24     2  0  2012 ?        00:00:00 [netns]
+root        26     2  0  2012 ?        00:00:37 [sync_supers]
+root        27     2  0  2012 ?        00:00:01 [bdi-default]
+root        28     2  0  2012 ?        00:00:00 [kintegrityd]
+root        29     2  0  2012 ?        00:00:00 [kblockd]
+root        30     2  0  2012 ?        00:00:00 [ata_sff]
+root        31     2  0  2012 ?        00:00:00 [khubd]
+root        32     2  0  2012 ?        00:00:00 [md]
+root        57     2  0  2012 ?        00:00:08 [khungtaskd]
+root        58     2  0  2012 ?        00:01:15 [kswapd0]
+root        59     2  0  2012 ?        00:01:32 [kswapd1]
+root        60     2  0  2012 ?        00:00:00 [ksmd]
+root        61     2  0  2012 ?        00:00:00 [khugepaged]
+root        62     2  0  2012 ?        00:00:00 [fsnotify_mark]
+root        63     2  0  2012 ?        00:00:00 [ecryptfs-kthrea]
+root        64     2  0  2012 ?        00:00:00 [crypto]
+root        72     2  0  2012 ?        00:00:00 [kthrotld]
+root        81     2  0  2012 ?        00:00:32 [kworker/3:1]
+root       101     2  0  2012 ?        00:00:00 [devfreq_wq]
+root       246     2  0  2012 ?        00:00:00 [scsi_eh_0]
+root       248     2  0  2012 ?        00:00:00 [scsi_eh_1]
+root       249     2  0  2012 ?        00:00:00 [scsi_eh_2]
+root       250     2  0  2012 ?        00:00:00 [scsi_eh_3]
+root       251     2  0  2012 ?        00:00:00 [scsi_eh_4]
+root       252     2  0  2012 ?        00:00:00 [scsi_eh_5]
+root       256     2  0  2012 ?        00:00:00 [kworker/u:5]
+root       257     2  0  2012 ?        00:01:31 [kworker/u:6]
+root       260     2  0  2012 ?        00:02:08 [kworker/1:1]
+root       289     2  0  2012 ?        00:00:00 [kdmflush]
+root       296     2  0  2012 ?        00:00:00 [kdmflush]
+root       308     2  0  2012 ?        00:00:00 [kdmflush]
+root       319     2  0  2012 ?        00:17:14 [jbd2/dm-1-8]
+root       320     2  0  2012 ?        00:00:00 [ext4-dio-unwrit]
+root       433     1  0  2012 ?        00:00:00 upstart-udev-bridge --daemon
+root       438     1  0  2012 ?        00:00:00 /sbin/udevd --daemon
+root       509     2  0  2012 ?        00:00:00 [edac-poller]
+root       522     2  0  2012 ?        00:00:00 [kpsmoused]
+www-data   664 18327  0 Dec02 ?        00:00:00 /usr/sbin/apache2 -k start
+root       848     1  0  2012 ?        00:00:00 upstart-socket-bridge --daemon
+root       983     2  0  2012 ?        00:00:32 [jbd2/dm-0-8]
+root       984     2  0  2012 ?        00:00:00 [ext4-dio-unwrit]
+root      1022     1  0  2012 ?        00:00:59 smbd -F
+root      1027     1  0  2012 ?        00:09:56 /usr/sbin/sshd -D
+syslog    1040     1  0  2012 ?        00:33:38 rsyslogd -c5
+root      1042     1  0  2012 ?        00:32:43 nmbd -D
+103       1047     1  0  2012 ?        00:00:00 dbus-daemon --system --fork --activation=upstart
+root      1067  1022  0  2012 ?        00:00:00 smbd -F
+www-data  1082 18327  0 10:39 ?        00:00:00 /usr/sbin/apache2 -k start
+root      1107     1  0  2012 tty4     00:00:00 /sbin/getty -8 38400 tty4
+root      1115     1  0  2012 tty5     00:00:00 /sbin/getty -8 38400 tty5
+root      1128     1  0  2012 tty2     00:00:00 /sbin/getty -8 38400 tty2
+root      1130     1  0  2012 tty3     00:00:00 /sbin/getty -8 38400 tty3
+root      1135     1  0  2012 tty6     00:00:00 /sbin/getty -8 38400 tty6
+root      1154     1  0  2012 ?        00:00:00 acpid -c /etc/acpi/events -s /var/run/acpid.socket
+root      1158     1  0  2012 ?        00:53:21 /usr/sbin/irqbalance
+whoopsie  1159     1  0  2012 ?        00:00:01 whoopsie
+root      1166     1  0  2012 ?        00:00:00 /usr/sbin/libvirtd -d
+mysql     1179     1  0  2012 ?        02:07:04 /usr/sbin/mysqld
+root      1184     1  0  2012 ?        00:00:54 cron
+daemon    1185     1  0  2012 ?        00:00:00 atd
+postgres  1237     1  0  2012 ?        00:08:39 /usr/lib/postgresql/9.1/bin/postgres -D /var/lib/postgresql/9.1/main -c config_file=/etc/postgresql/9.1/main/postgresql.conf
+107       1276     1  0  2012 ?        00:00:03 /usr/sbin/dnsmasq -u libvirt-dnsmasq --strict-order --bind-interfaces --pid-file=/var/run/libvirt/network/default.pid --conf-file= --except-interface lo --listen-address 192.168.122.1 --dhcp-range 192.168.122.2,192.168.122.254 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases --dhcp-lease-max=253 --dhcp-no-override
+postgres  1316  1237  0  2012 ?        00:12:49 postgres: writer process                                                                                                    
+postgres  1317  1237  0  2012 ?        00:09:57 postgres: wal writer process                                                                                                
+postgres  1318  1237  0  2012 ?        00:17:05 postgres: autovacuum launcher process                                                                                       
+postgres  1319  1237  0  2012 ?        00:16:04 postgres: stats collector process                                                                                           
+root      1442     1  0  2012 ?        00:00:12 /usr/sbin/winbindd
+root      1460  1442  0  2012 ?        00:00:11 /usr/sbin/winbindd
+tomcat6   1534     1  0  2012 ?        02:04:01 /usr/lib/jvm/default-java/bin/java -Djava.util.logging.config.file=/var/lib/tomcat6/conf/logging.properties -Djava.awt.headless=true -Xmx128m -XX:+UseConcMarkSweepGC -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.endorsed.dirs=/usr/share/tomcat6/endorsed -classpath /usr/share/tomcat6/bin/bootstrap.jar -Dcatalina.base=/var/lib/tomcat6 -Dcatalina.home=/usr/share/tomcat6 -Djava.io.tmpdir=/tmp/tomcat6-tomcat6-tmp org.apache.catalina.startup.Bootstrap start
+root      1546     2  0  2012 ?        00:08:12 [flush-252:1]
+root      1583     1  0  2012 tty1     00:00:00 /sbin/getty -8 38400 tty1
+root      1898  1442  0  2012 ?        00:00:00 /usr/sbin/winbindd
+root      3237  1027  0 12:53 ?        00:00:00 sshd: pi [priv]     
+root      3311   438  0 Nov14 ?        00:00:00 /sbin/udevd --daemon
+root      3312   438  0 Nov14 ?        00:00:00 /sbin/udevd --daemon
+pi        3373  3237  0 12:53 ?        00:00:00 sshd: pi@pts/4      
+pi        3374  3373  0 12:53 pts/4    00:00:00 -bash
+root      4894  1184  0 12:56 ?        00:00:00 CRON
+root      4895  1184  0 12:56 ?        00:00:00 CRON
+pi        4896  4894  0 12:56 ?        00:00:00 /bin/sh -c cd /data/PackRat && python readwhizzifest.py
+pi        4897  4895  0 12:56 ?        00:00:00 /bin/sh -c cd /data/PackRat && python hitman.py
+pi        4898  4896  0 12:56 ?        00:00:00 python readwhizzifest.py
+pi        4899  4897  0 12:56 ?        00:00:00 python hitman.py
+pi        4900  4898  0 12:56 ?        00:00:00 sh -c ps -ef > ps.txt
+pi        4901  4900  0 12:56 ?        00:00:00 ps -ef
+pi        4902  4899  0 12:56 ?        00:00:00 sh -c ps -ef > psh.txt
+root      6096  1027  0 Dec02 ?        00:00:00 sshd: pi [priv]     
+pi        6229  6096  0 Dec02 ?        00:00:00 sshd: pi@pts/5      
+pi        6230  6229  0 Dec02 pts/5    00:00:01 -bash
+www-data  6575 18327  4 Dec02 ?        01:00:01 /usr/sbin/apache2 -k start
+root      9467     2  0 Sep18 ?        00:00:16 [kworker/1:0]
+root     11549     2  0 Nov27 ?        00:00:58 [kworker/0:1]
+root     14866     2  0 Nov27 ?        00:00:15 [flush-252:0]
+root     16095  1442  0 Jun26 ?        00:00:00 /usr/sbin/winbindd
+root     17650  1027  0 12:34 ?        00:00:00 sshd: pi [priv]     
+pi       17783 17650  0 12:34 ?        00:00:00 sshd: pi@pts/0      
+pi       17784 17783  0 12:34 pts/0    00:00:00 -bash
+root     18327     1  0  2012 ?        00:04:14 /usr/sbin/apache2 -k start
+www-data 18450 18327  0 Dec02 ?        00:00:00 /usr/sbin/apache2 -k start
+root     19556  1184  0 11:51 ?        00:00:00 CRON
+pi       19558 19556  0 11:51 ?        00:00:00 /bin/sh -c cd /data/PackRat && python readwhizzifest.py
+pi       19561 19558  0 11:51 ?        00:00:00 python readwhizzifest.py
+pi       19566 19561  0 11:51 ?        00:00:00 sh -c python  /data/PackRat/master.py /data/PackRat/scrubber.py
+pi       19567 19566  0 11:51 ?        00:00:00 python /data/PackRat/master.py /data/PackRat/scrubber.py
+www-data 19737 18327  0 Dec02 ?        00:00:01 /usr/sbin/apache2 -k start
+www-data 21694 18327  0 11:54 ?        00:00:00 /usr/sbin/apache2 -k start
+root     21714     2  0 Oct22 ?        00:00:21 [kworker/2:0]
+www-data 21907 18327  0 11:54 ?        00:00:00 /usr/sbin/apache2 -k start
+www-data 21908 18327  0 11:54 ?        00:00:00 /usr/sbin/apache2 -k start
+root     22812  1027  0 12:41 ?        00:00:00 sshd: pi [priv]     
+pi       22945 22812  0 12:41 ?        00:00:00 sshd: pi@pts/2      
+pi       22946 22945  0 12:41 pts/2    00:00:00 -bash
+root     23784  1027  0 11:56 ?        00:00:00 sshd: pi [priv]     
+pi       23919 23784  0 11:56 ?        00:00:00 sshd: pi@pts/3      
+pi       23920 23919  0 11:56 pts/3    00:00:00 -bash
+root     24625     2  0 Nov27 ?        00:01:00 [kworker/0:0]
+root     24789     2  0 Dec01 ?        00:00:04 [kworker/2:2]
+www-data 25023 18327  0 01:06 ?        00:00:00 /usr/sbin/apache2 -k start
+www-data 25181 18327  4 Dec02 ?        01:00:01 /usr/sbin/apache2 -k start
diff --git a/quesoFiesta.sh b/quesoFiesta.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-SERVER=10.10.100.144
+SERVER='10.10.100.144'
 USER=pi
 ./manifetch.py
 ./diff.py

diff --git a/rat.txt b/rat.txt
@@ -0,0 +1,6 @@
+RAWRARAWR
+AWRAWRAWR
+AWRAWRAWR
+AWRAWRAWR
+AWRAWRAWR
+AWRAWRAWR
diff --git a/scrubber.pyc b/scrubber.pyc
diff --git a/temp/manifest.txt b/temp/manifest.txt
@@ -0,0 +1,11 @@
+57
+/data/gfsbin/kill.sh|975dedc12ab106805a6a73aa0bfb4ae0
+/data/gfsbin/diff.py|14011db83e7e9c92ef3f67dd931b474c
+/data/gfsbin/quesoFiesta.sh|c4d4d733c4660ee7e2cf632939839776
+/data/gfsbin/jankprocess.py|8248a684e662fc4e9e80c0645f61984d
+/data/gfsbin/whizzifest.txt|f7684a8a8103832eb525acc8a4feaec0
+/data/gfsbin/cheesePull.sh|d70e92a5d1a62235249af6200f8a2336
+/data/gfsbin/run.sh|43c5d1c741a742368378e9617e3129b8
+/data/gfsbin/manifetch.sh|30567b92908822a8d8cbb33f8e940bfa
+/data/gfsbin/readwhizzifest.py|5cc46d89177221a6308fe5e2605662e4
+/data/gfsbin/manifest.txt|04cc4ea929d10a7d1fde87c30f5cd64d
diff --git a/wHaatdoesthefoxsay.txt b/wHaatdoesthefoxsay.txt
@@ -0,0 +1 @@
+ringdingding
diff --git a/whizconfig.py b/whizconfig.py
@@ -1,3 +1,3 @@
 pis = ['10.10.117.10', '10.10.117.11', '10.10.117.12', '10.10.117.13', '10.10.117.14', '10.10.117.15', '10.10.117.16']
 
-path = "/data/gfsbin/"
+path = "/data/PackRat/"
diff --git a/whizconfig.pyc b/whizconfig.pyc
diff --git a/whizzifestC.txt b/whizzifestC.txt
@@ -1,2 +1,2 @@
-/data/gfsbin/httpServer.py
-/data/gfsbin/listener.py
+/data/PackRat/chunkserver.py
+/data/PackRat/listener.py
diff --git a/whizzifestM.txt b/whizzifestM.txt
@@ -1 +1,3 @@
 
+/data/PackRat/master.py
+/data/PackRat/scrubber.py