mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert all PHP-Based MySQL Locks introduced in #1584

Browse Source
This commit is contained in:
f0o
2015-09-02 14:46:42 +01:00
parent bc3916df2c
commit da9e071d7d
5 changed files with 4 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
discovery.php
View File

@@ -105,19 +105,8 @@ if ($config['distributed_poller'] === true) {
$where .= ' AND poller_group IN('.$config['distributed_poller_group'].')'; $where .= ' AND poller_group IN('.$config['distributed_poller_group'].')';
} }
echo 'Checking for MySQL Locks:';
while (!dbCheckLock('schema_update')) {
echo '.';
sleep(1);
}
echo PHP_EOL;
foreach (dbFetch("SELECT * FROM `devices` WHERE status = 1 AND disabled = 0 $where ORDER BY device_id DESC") as $device) { foreach (dbFetch("SELECT * FROM `devices` WHERE status = 1 AND disabled = 0 $where ORDER BY device_id DESC") as $device) {
if (dbGetLock('discovering.' . $device['device_id'])) { discover_device($device, $options);
register_shutdown_function('dbReleaseLock','discovering.'.$device['device_id']);
discover_device($device, $options);
dbReleaseLock('discovering.' . $device['device_id']);
}
} }
$end = utime(); $end = utime();

30
includes/dbFacile.mysql.php
View File

@@ -59,36 +59,6 @@ function dbQuery($sql, $parameters=array()) {
}//end dbQuery() }//end dbQuery()
/*
* Aquire a lock on a string
* */
function dbGetLock($data, $timeout = 0) {
$sql = 'SELECT GET_LOCK(\'' . $data . '\',' . $timeout . ')';
$result = dbFetchCell($sql);
return $result;
}
/*
* Check a lock on a string
* */
function dbCheckLock($data) {
$sql = 'SELECT IS_FREE_LOCK(\'' . $data . '\')';
$result = dbFetchCell($sql);
return $result;
}
/*
* Release a lock on a string
* */
function dbReleaseLock($data) {
$sql = 'SELECT RELEASE_LOCK(\'' . $data . '\')';
$result = dbFetchCell($sql);
return $result;
}
/* /*
* Passed an array and a table name, it attempts to insert the data into the table. * Passed an array and a table name, it attempts to insert the data into the table.
* Check for boolean false to determine whether insert failed * Check for boolean false to determine whether insert failed

29
includes/dbFacile.mysqli.php
View File

@@ -59,35 +59,6 @@ function dbQuery($sql, $parameters=array()) {
}//end dbQuery() }//end dbQuery()
/*
* Aquire a lock on a string
* */
function dbGetLock($data, $timeout = 0) {
$sql = 'SELECT GET_LOCK(\'' . $data . '\',' . $timeout . ')';
$result = dbFetchCell($sql);
return $result;
}
/*
* Check a lock on a string
* */
function dbCheckLock($data) {
$sql = 'SELECT IS_FREE_LOCK(\'' . $data . '\')';
$result = dbFetchCell($sql);
return $result;
}
/*
* Release a lock on a string
* */
function dbReleaseLock($data) {
$sql = 'SELECT RELEASE_LOCK(\'' . $data . '\')';
$result = dbFetchCell($sql);
return $result;
}
/* /*
* Passed an array and a table name, it attempts to insert the data into the table. * Passed an array and a table name, it attempts to insert the data into the table.
* Check for boolean false to determine whether insert failed * Check for boolean false to determine whether insert failed

8
includes/sql-schema/update.php
View File

@@ -91,13 +91,6 @@ if ($tmp[0] <= $db_rev) {
return; return;
} }
if (!dbGetLock('schema_update')) {
echo "Schema update already in progress. Exiting\n";
exit(1);
} //end if
register_shutdown_function('dbReleaseLock','schema_update');
foreach ($filelist as $file) { foreach ($filelist as $file) {
list($filename,$extension) = explode('.', $file, 2); list($filename,$extension) = explode('.', $file, 2);
if ($filename > $db_rev) { if ($filename > $db_rev) {
@@ -168,4 +161,3 @@ if ($updating) {
echo "-- Done\n"; echo "-- Done\n";
} }
dbReleaseLock('schema_update');

17
poller.php
View File

@@ -100,13 +100,6 @@ if (isset($options['r'])) {
$config['norrd'] = true; $config['norrd'] = true;
} }
echo 'Checking for MySQL Locks:';
while (!dbCheckLock('schema_update')) {
echo '.';
sleep(1);
}
echo PHP_EOL;
rrdtool_pipe_open($rrd_process, $rrd_pipes); rrdtool_pipe_open($rrd_process, $rrd_pipes);
echo "Starting polling run:\n\n"; echo "Starting polling run:\n\n";
@@ -117,13 +110,9 @@ if (!isset($query)) {
foreach (dbFetch($query) as $device) { foreach (dbFetch($query) as $device) {
$device = dbFetchRow("SELECT * FROM `devices` WHERE `device_id` = '".$device['device_id']."'"); $device = dbFetchRow("SELECT * FROM `devices` WHERE `device_id` = '".$device['device_id']."'");
if (dbGetLock('polling.' . $device['device_id'])) { poll_device($device, $options);
register_shutdown_function('dbReleaseLock','polling.'.$device['device_id']); RunRules($device['device_id']);
poll_device($device, $options); echo "\r\n";
RunRules($device['device_id']);
echo "\r\n";
dbReleaseLock('polling.' . $device['device_id']);
}
$polled_devices++; $polled_devices++;
} }