FreeNAS

Revision: 6869
          http://freenas.svn.sourceforge.net/freenas/?rev=6869&view=rev
Author:   delphij
Date:     2011-07-02 19:10:22 +0000 (Sat, 02 Jul 2011)

Log Message:
-----------
Consistently use timedelta instead of just replacing components.

This fixes #492.

Modified Paths:
--------------
    trunk/gui/tools/autosnap.py


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6927
          http://freenas.svn.sourceforge.net/freenas/?rev=6927&view=rev
Author:   delphij
Date:     2011-07-11 22:19:54 +0000 (Mon, 11 Jul 2011)

Log Message:
-----------
Properly set arg0.

Modified Paths:
--------------
    trunk/gui/tools/autosnap.py


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8033
          http://freenas.svn.sourceforge.net/freenas/?rev=8033&view=rev
Author:   yaberauneya
Date:     2011-09-29 02:14:14 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
Don't emit informational every minute when listing the snapshots. This is confusing and noisy.

Fixes ticket 459 and various confusing customer questions (we can always enable verbose debug mode later).

Modified Paths:
--------------
    trunk/gui/tools/autosnap.py

Modified: trunk/gui/tools/autosnap.py
===================================================================
--- trunk/gui/tools/autosnap.py	2011-09-28 22:41:12 UTC (rev 8032)
+++ trunk/gui/tools/autosnap.py	2011-09-29 02:14:14 UTC (rev 8033)
@@ -25,6 +25,9 @@
 # SUCH DAMAGE.
 #
 
+import os
+import re
+import subprocess
 import sys
 sys.path.append('/usr/local/www')
 sys.path.append('/usr/local/www/freenasUI')
@@ -34,8 +37,6 @@
 from django.core.management import setup_environ
 setup_environ(settings)
 
-import re
-from os import execl
 from freenasUI.storage.models import Task, Replication
 from datetime import datetime, time, timedelta
 
@@ -130,7 +131,11 @@
 # Grab all existing snapshot and filter out the expiring ones
 snapshots = {}
 snapshots_pending_delete = set()
-zfsproc = pipeopen("/sbin/zfs list -t snapshot -H")
+if True:
+    zfsproc = subprocess.Popen(['/sbin/zfs', 'list', '-t', 'snapshot', '-H'],
+                               stdout=subprocess.PIPE)
+else:
+    zfsproc = pipeopen("/sbin/zfs list -t snapshot -H")
 lines = zfsproc.communicate()[0].split('\n')
 reg_autosnap = re.compile('^auto-(?P<year>\d{4})(?P<month>\d{2})(?P<day>\d{2}).(?P<hour>\d{2})(?P<minute>\d{2})-(?P<retcount>\d+)(?P<retunit>[hdwmy])$')
 for line in lines:
@@ -202,5 +207,6 @@
             system(snapcmd)
     MNTLOCK.unlock()
 
-execl('/usr/local/bin/python', 'python', '/usr/local/www/freenasUI/tools/autorepl.py')
-
+os.execl('/usr/local/bin/python',
+         'python',
+         '/usr/local/www/freenasUI/tools/autorepl.py')

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8198
          http://freenas.svn.sourceforge.net/freenas/?rev=8198&view=rev
Author:   delphij
Date:     2011-10-10 09:05:10 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
Allow only one instance of this script be run at one time.

Modified Paths:
--------------
    trunk/gui/tools/autosnap.py

Modified: trunk/gui/tools/autosnap.py
===================================================================
--- trunk/gui/tools/autosnap.py	2011-10-10 06:47:25 UTC (rev 8197)
+++ trunk/gui/tools/autosnap.py	2011-10-10 09:05:10 UTC (rev 8198)
@@ -103,6 +103,45 @@
 
     return False
 
+# Detect if another instance is running
+def exit_if_running(pid):
+    syslog.syslog(syslog.LOG_DEBUG,
+                  "Checking if process %d is still alive" % (pid, ))
+    try:
+        os.kill(pid, 0)
+        # If we reached here, there is another process in progress
+        syslog.syslog(syslog.LOG_DEBUG,
+                      "Process %d still working, quitting" % (pid, ))
+        sys.exit(0)
+    except OSError:
+        syslog.syslog(syslog.LOG_DEBUG, "Process %d gone" % (pid, ))
+
+mypid = os.getpid()
+
+# (mis)use MNTLOCK as PIDFILE lock.
+locked = True
+try:
+    MNTLOCK.lock_try()
+except IOError:
+    locked = False
+if not locked:
+    sys.exit(0)
+
+AUTOSNAP_PID = -1
+try:
+    with open('/var/run/autosnap.pid') as pidfile:
+        AUTOSNAP_PID = int(pidfile.read())
+except:
+    pass
+
+if AUTOSNAP_PID != -1:
+    exit_if_running(AUTOSNAP_PID)
+
+with open('/var/run/autosnap.pid', 'w') as pidfile:
+    pidfile.write('%d' % mypid)
+
+MNTLOCK.unlock()
+
 now = datetime.now().replace(microsecond = 0)
 if now.second < 30:
     snaptime = now.replace(second = 0)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8199
          http://freenas.svn.sourceforge.net/freenas/?rev=8199&view=rev
Author:   delphij
Date:     2011-10-10 09:10:36 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
Remove pidfile right before running autorepl.

Modified Paths:
--------------
    trunk/gui/tools/autosnap.py

Modified: trunk/gui/tools/autosnap.py
===================================================================
--- trunk/gui/tools/autosnap.py	2011-10-10 09:05:10 UTC (rev 8198)
+++ trunk/gui/tools/autosnap.py	2011-10-10 09:10:36 UTC (rev 8199)
@@ -234,8 +234,8 @@
         snapcmd = '/sbin/zfs snapshot%s %s' % (rflag, snapname)
         system(snapcmd)
 
+MNTLOCK.lock()
 for snapshot in snapshots_pending_delete:
-    MNTLOCK.lock()
     zfsproc = pipeopen('/sbin/zfs get -H freenas:state %s' % (snapshot))
     output = zfsproc.communicate()[0]
     if output != '':
@@ -243,8 +243,10 @@
 	if value == '-':
             snapcmd = '/sbin/zfs destroy %s' % (snapshot)
             system(snapcmd)
-    MNTLOCK.unlock()
 
+os.unlink('/var/run/autosnap.pid')
+MNTLOCK.unlock()
+
 os.execl('/usr/local/bin/python',
          'python',
          '/usr/local/www/freenasUI/tools/autorepl.py')

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8291
          http://freenas.svn.sourceforge.net/freenas/?rev=8291&view=rev
Author:   zippybr
Date:     2011-10-14 14:08:53 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
make autosnap work with filesystem/zvol anme instead of mp_path

Modified Paths:
--------------
    trunk/gui/tools/autosnap.py

Modified: trunk/gui/tools/autosnap.py
===================================================================
--- trunk/gui/tools/autosnap.py	2011-10-14 13:14:59 UTC (rev 8290)
+++ trunk/gui/tools/autosnap.py	2011-10-14 14:08:53 UTC (rev 8291)
@@ -157,15 +157,15 @@
 TaskObjects = Task.objects.all()
 for task in TaskObjects:
     if isMatchingTime(task, snaptime):
-        mp_path = "/mnt/" + task.task_filesystem
+        fs = task.task_filesystem
         expire_time = ('%s%s' % (task.task_ret_count, task.task_ret_unit[0])).__str__()
         tasklist = []
-        if mp_to_task_map.has_key((mp_path, expire_time)):
-            tasklist = mp_to_task_map[(mp_path, expire_time)]
+        if mp_to_task_map.has_key((fs, expire_time)):
+            tasklist = mp_to_task_map[(fs, expire_time)]
             tasklist.append(task)
         else:
             tasklist = [task]
-        mp_to_task_map[(mp_path, expire_time)] = tasklist
+        mp_to_task_map[(fs, expire_time)] = tasklist
 
 # Do not proceed further if we are not going to generate any snapshots for this run
 if len(mp_to_task_map) == 0:
@@ -180,8 +180,7 @@
 for line in lines:
     if line != '':
         snapshot_name = line.split('\t')[0]
-        mp, snapname = snapshot_name.split('@')
-        mp = '/mnt/' + mp
+        fs, snapname = snapshot_name.split('@')
         snapname_match = reg_autosnap.match(snapname)
         if snapname_match != None:
             snap_infodict = snapname_match.groupdict()
@@ -189,13 +188,13 @@
             if snap_expired(snap_infodict, snaptime):
                 snapshots_pending_delete.add(snapshot_name)
             else:
-                if mp_to_task_map.has_key((mp, snap_ret_policy)):
-                    if snapshots.has_key((mp, snap_ret_policy)):
-                        last_snapinfo = snapshots[(mp, snap_ret_policy)]
+                if mp_to_task_map.has_key((fs, snap_ret_policy)):
+                    if snapshots.has_key((fs, snap_ret_policy)):
+                        last_snapinfo = snapshots[(fs, snap_ret_policy)]
                         if snapinfodict2datetime(last_snapinfo) < snapinfodict2datetime(snap_infodict):
-                            snapshots[(mp, snap_ret_policy)] = snap_infodict
+                            snapshots[(fs, snap_ret_policy)] = snap_infodict
                     else:
-                        snapshots[(mp, snap_ret_policy)] = snap_infodict
+                        snapshots[(fs, snap_ret_policy)] = snap_infodict
 
 list_mp = mp_to_task_map.keys()
 
@@ -213,7 +212,7 @@
 snaptime_str = snaptime.strftime('%Y%m%d.%H%M')
 
 for mpkey in mp_to_task_map:
-    mp_path, expire = mpkey
+    fs, expire = mpkey
     recursive = False
     for task in tasklist:
         if task.task_recursive == True:
@@ -223,7 +222,6 @@
     else:
         rflag = ''
 
-    fs = mp_path[5:]
     snapname = '%s@...' % (fs, snaptime_str, expire)
 
     # If there is associated replication task, mark the snapshots as 'NEW'.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8719
          http://freenas.svn.sourceforge.net/freenas/?rev=8719&view=rev
Author:   delphij
Date:     2011-11-18 19:06:46 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
Don't try to add 1 minute when minute == 59.  In reality this should never
happen but better safe than sorry.

Modified Paths:
--------------
    trunk/gui/tools/autosnap.py

Modified: trunk/gui/tools/autosnap.py
===================================================================
--- trunk/gui/tools/autosnap.py	2011-11-18 17:22:09 UTC (rev 8718)
+++ trunk/gui/tools/autosnap.py	2011-11-18 19:06:46 UTC (rev 8719)
@@ -144,7 +144,7 @@
 MNTLOCK.unlock()
 
 now = datetime.now().replace(microsecond = 0)
-if now.second < 30:
+if now.second < 30 or now.minute == 59:
     snaptime = now.replace(second = 0)
 else:
     snaptime = now.replace(minute = now.minute  + 1, second = 0)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10306
          http://freenas.svn.sourceforge.net/freenas/?rev=10306&view=rev
Author:   delphij
Date:     2012-02-27 22:28:11 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
Exclude snapshots with clone from pending delete list.

Modified Paths:
--------------
    trunk/gui/tools/autosnap.py

Modified: trunk/gui/tools/autosnap.py
===================================================================
--- trunk/gui/tools/autosnap.py	2012-02-27 21:38:52 UTC (rev 10305)
+++ trunk/gui/tools/autosnap.py	2012-02-27 22:28:11 UTC (rev 10306)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #- 
-# Copyright (c) 2011 iXsystems, Inc.
+# Copyright (c) 2011, 2012 iXsystems, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -196,6 +196,16 @@
                     else:
                         snapshots[(fs, snap_ret_policy)] = snap_infodict
 
+# Exclude snapshots that have clones associated from being deleted
+if len(snapshots_pending_delete) > 0:
+    snapshots_cloned = set()
+    zfsproc = pipeopen("/sbin/zfs list -H -t filesystem,volume -o origin", debug)
+    lines = zfsproc.communicate()[0].split('\n')
+    for snapshot_name in lines:
+        if snapshot_name != '-':
+            snapshots_cloned.add(snapshot_name)
+    snapshots_pending_delete = snapshots_pending_delete.difference(snapshots_cloned)
+
 list_mp = mp_to_task_map.keys()
 
 for mpkey in list_mp:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11342
          http://freenas.svn.sourceforge.net/freenas/?rev=11342&view=rev
Author:   zippybr
Date:     2012-04-30 17:38:17 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
Use python logging in autosnap.py

Modified Paths:
--------------
    trunk/gui/tools/autosnap.py

Modified: trunk/gui/tools/autosnap.py
===================================================================
--- trunk/gui/tools/autosnap.py	2012-04-30 14:50:58 UTC (rev 11341)
+++ trunk/gui/tools/autosnap.py	2012-04-30 17:38:17 UTC (rev 11342)
@@ -25,11 +25,11 @@
 # SUCH DAMAGE.
 #
 
+import logging
 import os
 import re
 import subprocess
 import sys
-import syslog
 sys.path.append('/usr/local/www')
 sys.path.append('/usr/local/www/freenasUI')
 
@@ -44,6 +44,8 @@
 from freenasUI.common.pipesubr import setname, pipeopen, system
 from freenasUI.common.locks import mntlock
 
+log = logging.getLogger('tools.autosnap')
+
 # NOTE
 #
 # In this script there is no asynchnous programming so ALL locks are obtained
@@ -106,16 +108,14 @@
 
 # Detect if another instance is running
 def exit_if_running(pid):
-    syslog.syslog(syslog.LOG_DEBUG,
-                  "Checking if process %d is still alive" % (pid, ))
+    log.debug("Checking if process %d is still alive", pid)
     try:
         os.kill(pid, 0)
         # If we reached here, there is another process in progress
-        syslog.syslog(syslog.LOG_DEBUG,
-                      "Process %d still working, quitting" % (pid, ))
+        log.debug("Process %d still working, quitting", pid)
         sys.exit(0)
     except OSError:
-        syslog.syslog(syslog.LOG_DEBUG, "Process %d gone" % (pid, ))
+        log.debug("Process %d gone", pid)
 
 mypid = os.getpid()
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11591
          http://freenas.svn.sourceforge.net/freenas/?rev=11591&view=rev
Author:   zippybr
Date:     2012-05-28 16:08:05 +0000 (Mon, 28 May 2012)
Log Message:
-----------
Remove a \t before someone screw it up due to different editor settings

Modified Paths:
--------------
    trunk/gui/tools/autosnap.py

Modified: trunk/gui/tools/autosnap.py
===================================================================
--- trunk/gui/tools/autosnap.py	2012-05-28 15:40:25 UTC (rev 11590)
+++ trunk/gui/tools/autosnap.py	2012-05-28 16:08:05 UTC (rev 11591)
@@ -28,7 +28,6 @@
 import logging
 import os
 import re
-import subprocess
 import sys
 sys.path.append('/usr/local/www')
 sys.path.append('/usr/local/www/freenasUI')
@@ -143,11 +142,11 @@
 
 MNTLOCK.unlock()
 
-now = datetime.now().replace(microsecond = 0)
+now = datetime.now().replace(microsecond=0)
 if now.second < 30 or now.minute == 59:
-    snaptime = now.replace(second = 0)
+    snaptime = now.replace(second=0)
 else:
-    snaptime = now.replace(minute = now.minute  + 1, second = 0)
+    snaptime = now.replace(minute=now.minute + 1, second=0)
 
 mp_to_task_map = {}
 
@@ -250,7 +249,7 @@
     output = zfsproc.communicate()[0]
     if output != '':
         fsname, attrname, value, source = output.split('\n')[0].split('\t')
-	if value == '-':
+        if value == '-':
             snapcmd = '/sbin/zfs destroy %s' % (snapshot)
             system(snapcmd)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11777
          http://freenas.svn.sourceforge.net/freenas/?rev=11777&view=rev
Author:   delphij
Date:     2012-06-22 18:37:08 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
When begin time is greater than end time, it means the user wanted the
schedule to cross midnight.  For instance:

	Begin at 20:00 and End at 04:00

Should mean start from this day's 20:00 and end at next day's 04:00.

Previous code would treat this as nothing should happen because the
expression will never be true, and the administrator will have to
create two schedules, one covering 20:00 through 23:59, and another
covering 00:00 through 04:00.

Note that the day of the week constraint is still in effect.

Reported by:	jsa

Modified Paths:
--------------
    trunk/gui/tools/autosnap.py

Modified: trunk/gui/tools/autosnap.py
===================================================================
--- trunk/gui/tools/autosnap.py	2012-06-22 15:47:57 UTC (rev 11776)
+++ trunk/gui/tools/autosnap.py	2012-06-22 18:37:08 UTC (rev 11777)
@@ -85,7 +85,10 @@
     return snapinfo_expirationtime <= snaptime
 
 def isTimeBetween(time_to_test, begin_time, end_time):
-    return ((begin_time <= time_to_test) and (time_to_test <= end_time))
+    if begin_time < end_time:
+        return ((begin_time <= time_to_test) and (time_to_test <= end_time))
+    else:
+        return ((begin_time <= time_to_test) or (time_to_test <= end_time))
 
 def isMatchingTime(task, snaptime):
     curtime = time(snaptime.hour, snaptime.minute)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11778
          http://freenas.svn.sourceforge.net/freenas/?rev=11778&view=rev
Author:   delphij
Date:     2012-06-22 18:48:11 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
Special handling for end_time = 00:00 case.  If the user specified the time
that way, consider the all time beginning from begin_time, to next day's
00:00 as valid range.

Modified Paths:
--------------
    trunk/gui/tools/autosnap.py

Modified: trunk/gui/tools/autosnap.py
===================================================================
--- trunk/gui/tools/autosnap.py	2012-06-22 18:37:08 UTC (rev 11777)
+++ trunk/gui/tools/autosnap.py	2012-06-22 18:48:11 UTC (rev 11778)
@@ -85,7 +85,9 @@
     return snapinfo_expirationtime <= snaptime
 
 def isTimeBetween(time_to_test, begin_time, end_time):
-    if begin_time < end_time:
+    if end_time == time(0, 0):
+        return ((begin_time <= time_to_test) or (time_to_test == end_time))
+    elif begin_time < end_time:
         return ((begin_time <= time_to_test) and (time_to_test <= end_time))
     else:
         return ((begin_time <= time_to_test) or (time_to_test <= end_time))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12005
          http://freenas.svn.sourceforge.net/freenas/?rev=12005&view=rev
Author:   zippybr
Date:     2012-07-30 19:16:38 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Fix recursive snapshots for multiple tasks

Submitted-by: monarchdodra
Approved-by: delphij

Modified Paths:
--------------
    trunk/gui/tools/autosnap.py

Modified: trunk/gui/tools/autosnap.py
===================================================================
--- trunk/gui/tools/autosnap.py	2012-07-30 19:16:16 UTC (rev 12004)
+++ trunk/gui/tools/autosnap.py	2012-07-30 19:16:38 UTC (rev 12005)
@@ -224,7 +224,7 @@
 
 snaptime_str = snaptime.strftime('%Y%m%d.%H%M')
 
-for mpkey in mp_to_task_map:
+for mpkey, tasklist in mp_to_task_map.items():
     fs, expire = mpkey
     recursive = False
     for task in tasklist:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12445
          http://freenas.svn.sourceforge.net/freenas/?rev=12445&view=rev
Author:   delphij
Date:     2012-09-24 19:33:43 +0000 (Mon, 24 Sep 2012)
Log Message:
-----------
When destroying snapshot, do it recursively.

Modified Paths:
--------------
    trunk/gui/tools/autosnap.py

Modified: trunk/gui/tools/autosnap.py
===================================================================
--- trunk/gui/tools/autosnap.py	2012-09-24 17:55:37 UTC (rev 12444)
+++ trunk/gui/tools/autosnap.py	2012-09-24 19:33:43 UTC (rev 12445)
@@ -253,7 +253,7 @@
     if output != '':
         fsname, attrname, value, source = output.split('\n')[0].split('\t')
         if value == '-':
-            snapcmd = '/sbin/zfs destroy %s' % (snapshot)
+            snapcmd = '/sbin/zfs destroy -r %s' % (snapshot)
             proc = pipeopen(snapcmd, logger=log)
             err = proc.communicate()[1]
             if proc.returncode != 0:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.