Merge lp:~jr.allen/unifield-server/us3292 into lp:unifield-server

[jftempo]

=== modified file 'bin/updater.py'
--- bin/updater.py	2017-07-13 14:59:01 +0000
+++ bin/updater.py	2017-08-25 15:24:51 +0000
@@ -584,13 +584,12 @@
 def _is_major(oldVer, newVer):
     oldVer = oldVer.split('.')
     newVer = newVer.split('.')
-    if oldVer[0] != newVer[0]:
-        return True
-    if oldVer[0] >= 10:
+    if int(oldVer[0]) >= 10:
         # for 10.x and onward, second position indicates minor
         # version: https://www.postgresql.org/support/versioning/
-        return False
-    if oldVer[1] != newVer[1]:
+        return oldVer[0] != newVer[0]
+    if (oldVer[0] != newVer[0] or
+            oldVer[0] == newVer[0] and oldVer[1] != newVer[1]):
         return True
     return False
 
@@ -615,12 +614,11 @@
     """
     This function is run on every server start (see openerp-server.py).
     If the conditions are not right for a PostgreSQL update, it
-    immeditately returns, so that the server can start up (the common case).
+    immediately returns, so that the server can start up (the common case).
     If an update is required, then it attempts the update. If the
     update fails, it must leave the server in the same condition it
     started, i.e. with the original Postgres up and running.
     """
-
     # Postgres updates are only done on Windows.
     if os.name != "nt":
         return
@@ -632,7 +630,7 @@
     try:
         log = open(log_file, 'a')
     except Exception as e:
-        log = os.stderr
+        log = sys.stderr
         warn("Could not open %s correctly: %s" % (log_file, e))
 
     # If there is no patch file available, then there's no
@@ -690,17 +688,22 @@
     # 1. figure out where the old PG is and copy it to pgsql-next
     # 2. patch pgsql-next, nuke patch file
     # 3. prepare new db dir using new initdb, old user/pass.
+    # 3.5 Alter tables to work around a bug
     # 4. stop server
     # 5. pg_upgrade -> if fail, clean db dir, goto 8
     # 6. commit to new bin dir, put it in '..\pgsql'
     # 7. if old was 8.4, change service entry
     # 8. start server
+    # 9. Alter tables again to back out workaround
 
     warn("Postgres major update from %s to %s" % (oldVer, newVer))
     import tools
 
     stopped = False
     pg_new_db = None
+    run_analyze = False
+    re_alter = False
+    failed = False
     try:
         env = os.environ
         if tools.config.get('db_user'):
@@ -709,7 +712,7 @@
             env['PGPASSWORD'] = tools.config['db_password']
 
         pg_new = r'..\pgsql-next'
-        if oldVer == '8.4.14':
+        if oldVer == '8.4.17':
             svc = 'PostgreSQL_For_OpenERP'
             pg_old = r'D:\MSF data\Unifield\PostgreSQL'
         else:
@@ -736,7 +739,7 @@
             warn("Removing previous %s directory" % pg_new)
             shutil.rmtree(pg_new)
 
-        if oldVer == '8.4.14':
+        if oldVer == '8.4.17':
             warn("Creating %s by selective copy from %s" % (pg_new, pg_old))
             os.mkdir(pg_new)
             for d in ('bin', 'lib', 'share'):
@@ -761,16 +764,16 @@
             raise RuntimeError('New data directory %s already exists.' % pg_new_db)
         pwf = tempfile.NamedTemporaryFile(delete=False)
         pwf.write(tools.config.get('db_password'))
-        # TODO: apply same fix here for trust as in the AIO
-        cmd = [ os.path.join(pg_new, 'bin', 'initdb'),
+        pwf.close()
+        cmd = [ os.path.join(pg_new, 'bin', 'initdb.exe'),
                 '--pwfile', pwf.name,
-                '--data-checksums', '-A', 'md5',
+                '-A', 'md5',
                 '-U', tools.config.get('db_user'),
                 '--locale', 'English_United States',
                 '-E', 'UTF8', pg_new_db
                 ]
-        rc = subprocess.call(cmd, stdout=log, stderr=log)
-        pwf.close()
+        warn('initdb: %r' % cmd)
+        rc = subprocess.call(cmd, stdout=log, stderr=log, env=env)
         os.remove(pwf.name)
         if rc != 0:
             raise RuntimeError("initdb returned %d" % rc)
@@ -782,12 +785,37 @@
             f.write("listen_addresses = 'localhost'\n")
             f.write("shared_buffers = 1024MB\n")
 
+        # 3.5: Alter tables to work around
+        # https://bugs.launchpad.net/openobject-server/+bug/782688
+        cmd = [ os.path.join(pg_old, 'bin', 'psql'), '-A', '-t', '-c',
+                'select datname from pg_database where not datistemplate and datname != \'postgres\'', 'postgres' ]
+        try:
+            out = subprocess.check_output(cmd, stderr=log, env=env)
+        except subprocess.CalledProcessError as e:
+            warn("alter tables failed to get db list: %s" % e)
+            out = ""
+        dbs = out.split()
+
+        cf = tempfile.NamedTemporaryFile(delete=False)
+        for db in dbs:
+            warn("alter tables in %s" % db)
+            cf.write("\\connect \"%s\"\n alter table ir_actions alter column \"name\" drop not null;\n" % db)
+        cf.close()
+        cmd = [ os.path.join(pg_old, 'bin', 'psql'), '-f', cf.name, 'postgres' ]
+        out = None
+        try:
+            out = subprocess.check_output(cmd, stderr=log, env=env)
+        except subprocess.CalledProcessError as e:
+            warn("problem running psql: %s" % e)
+        warn("alter tables output is: ", out)
+        os.remove(cf.name)
+        re_alter = True
+
         # 4: stop old service
         subprocess.call('net stop %s' % svc, stdout=log, stderr=log)
         stopped = True
 
         # 5: pg_upgrade
-        run_analyze = False
         cmd = [ os.path.join(pg_new, 'bin', 'pg_upgrade'),
                 '-b', os.path.join(pg_old, 'bin'),
                 '-B', os.path.join(pg_new, 'bin'),
@@ -799,7 +827,7 @@
 
         # The pg_upgrade went ok, so we are committed now. Nuke the
         # old db directory and move the upgraded one into place.
-        warn("pg_upgrade returned %d, commiting to new version" % rc)
+        warn("pg_upgrade returned %d, committing to new version" % rc)
         run_analyze = True
 
         warn("Rename %s to %s." % (pg_new_db, pg_old_db))
@@ -811,7 +839,7 @@
         shutil.rmtree(pg_old_db2)
 
         # 6: commit to new bin dir
-        if oldVer == '8.4.14':
+        if oldVer == '8.4.17':
             # Move pg_new to it's final name.
             os.rename(pg_new, r'..\pgsql')
             # For 8.4->9.9.x transition, nuke 8.4 install
@@ -820,24 +848,27 @@
                     '--mode', 'unattended',
                     ]
             rc = subprocess.call(cmd, stdout=log, stderr=log)
-            if rc != 0:
-                warn("PostgreSQL 8.4 uninstall returned %d" % rc)
+            warn("PostgreSQL 8.4 uninstall returned %d" % rc)
             pg_old = r'..\pgsql'
         else:
             warn("Remove %s." % pg_old)
             shutil.rmtree(pg_old)
+            warn("Remove done.")
 
-        warn("Rename %s to %s." % (pg_new, pg_old))
-        os.rename(pg_new, pg_old)
+            warn("Rename %s to %s." % (pg_new, pg_old))
+            shutil.move(pg_new, pg_old)
+            warn("Rename done.")
 
         pgp = os.path.normpath(os.path.join(pg_old, 'bin'))
         if tools.config['pg_path'] != pgp:
             warn("Setting pg_path to %s." % pgp)
             tools.config['pg_path'] = pgp
             tools.config.save()
+        else:
+            warn("pg_path is correct")
 
         # 7: change service entry to the correct install location
-        if oldVer == '8.4.14':
+        if oldVer == '8.4.17':
             cmd = [
                 os.path.join(pg_old, 'bin', 'pg_ctl'),
                 'register', '-N', 'Postgres',
@@ -853,6 +884,7 @@
     except Exception as e:
         s = str(e) or type(e)
         warn('Failed to update Postgres:', s)
+        failed = True
     finally:
         try:
             if pg_new_db is not None and os.path.exists(pg_new_db):
@@ -866,10 +898,30 @@
         if stopped:
             warn('Starting service %s' % svc)
             subprocess.call('net start %s' % svc, stdout=log, stderr=log)
+
+        # 9. re-alter tables to put the problematic constraint back on
+        if re_alter:        
+            cf = tempfile.NamedTemporaryFile(delete=False)
+            for db in dbs:
+                warn("alter tables in %s" % db)
+                cf.write("\\connect \"%s\"\n alter table ir_actions alter column \"name\" set not null;\n" % db)
+            cf.close()
+            cmd = [ os.path.join(pg_old, 'bin', 'psql'), '-f', cf.name, 'postgres' ]
+            out = None
+            try:
+                out = subprocess.check_output(cmd, stderr=log, env=env)
+            except subprocess.CalledProcessError as e:
+                warn("problem running psql: %s" % e)
+            warn("re-alter tables output is: ", out)
+            os.remove(cf.name)
+
         if run_analyze:
             cmd = [ os.path.join(r'..\pgsql', 'bin', 'vacuumdb'),
                     '--all', '--analyze-only' ]
             subprocess.call(cmd, stdout=log, stderr=log, env=env)
+
+        if not failed:
+            warn("Major update done.")
     return
 
 # https://stackoverflow.com/questions/51658/cross-platform-space-remaining-on-volume-using-python
@@ -895,12 +947,12 @@
     assert pf == None
 
     # one good file
-    with open('pgsql-8.4.14-9.6.3-patch', 'wb') as f:
+    with open('pgsql-8.4.17-9.6.3-patch', 'wb') as f:
         f.write('Fake patch for testing.')
     pf, oldVer, newVer = _find_pg_patch()
-    assert oldVer == '8.4.14'
+    assert oldVer == '8.4.17'
     assert newVer == '9.6.3'
-    assert pf == 'pgsql-8.4.14-9.6.3-patch'
+    assert pf == 'pgsql-8.4.17-9.6.3-patch'
 
     # two files: oops
     warn("Expect 2 messages on stderr after this:")
@@ -910,16 +962,20 @@
     assert pf == None
 
     # one file with wrong version format
-    os.remove('pgsql-8.4.14-9.6.3-patch')
+    os.remove('pgsql-8.4.17-9.6.3-patch')
     pf, oldVer, newVer = _find_pg_patch()
     assert pf == None
 
-    assert _is_major('8.4.14', '9.6.3')
-    assert not _is_major('8.4.14', '8.4.15')
+    assert _is_major('8.4.17', '9.6.3')
+    assert not _is_major('8.4.16', '8.4.17')
+    assert _is_major('9.5.6', '9.6.3')
     assert _is_major('9.6.9', '10.1')
     assert not _is_major('10.1', '10.2')
     assert _is_major('21.9', '22.1')
 
     os.chdir('..')
     shutil.rmtree(d)
-    assert get_free_space_mb("D:\\") != None
+    root = "D:\\"
+    if sys.platform != 'win32':
+        root = '/'
+    assert get_free_space_mb(root) != None