[#4373] Fix postgresql pick logic

Fix the if clause on the second try pick in sflqPickFreeLease*

modified:   src/share/database/scripts/pgsql/dhcpdb_create.pgsql
modified:   src/share/database/scripts/pgsql/upgrade_032_to_033.sh.in

diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index 0fcf432495491db87d3c8b3caccc5d187c23c47d..bf001162434aedfe532392b0935c668daa1199f9 100644 (file)
--- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
+++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
@@ -6945,7 +6945,7 @@ BEGIN
     -- Didn't find one, so try front half of the range, including
     -- the last pick. This avoids returning nothing if there is only
     -- one address free.
-    IF (free_address IS NULL AND last_address != p_start_address)
+    IF (free_address IS NULL)
     THEN
         SELECT f.address INTO free_address FROM free_lease4 f
             LEFT JOIN lease4 ON f.address = lease4.address
@@ -7300,7 +7300,7 @@ BEGIN
     -- Didn't find one, so try front half of the range, including
     -- the last pick. This avoids returning nothing if there is only
     -- one address free.
-    IF (free_address IS NULL AND bin_last_address != bin_start_address)
+    IF (free_address IS NULL)
     THEN
         SELECT f.address INTO free_address FROM free_lease6 f
             LEFT JOIN lease6 on f.address = lease6.address

diff --git a/src/share/database/scripts/pgsql/upgrade_032_to_033.sh.in b/src/share/database/scripts/pgsql/upgrade_032_to_033.sh.in
index 039a2f8df9585f7003c164ea6fac66a4efbdc035..846a84d621d4b05beb4694893cc2cac470ada5b6 100755 (executable)
--- a/src/share/database/scripts/pgsql/upgrade_032_to_033.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_032_to_033.sh.in
@@ -231,7 +231,7 @@ BEGIN
     -- Didn't find one, so try front half of the range, including
     -- the last pick. This avoids returning nothing if there is only
     -- one address free.
-    IF (free_address IS NULL AND last_address != p_start_address)
+    IF (free_address IS NULL)
     THEN
         SELECT f.address INTO free_address FROM free_lease4 f
             LEFT JOIN lease4 ON f.address = lease4.address
@@ -587,7 +587,7 @@ BEGIN
     -- Didn't find one, so try front half of the range, including
     -- the last pick. This avoids returning nothing if there is only
     -- one address free.
-    IF (free_address IS NULL AND bin_last_address != bin_start_address)
+    IF (free_address IS NULL)
     THEN
         SELECT f.address INTO free_address FROM free_lease6 f
             LEFT JOIN lease6 on f.address = lease6.address