diff options
author | David Rothstein <drothstein@gmail.com> | 2015-03-30 19:39:05 -0400 |
---|---|---|
committer | David Rothstein <drothstein@gmail.com> | 2015-03-30 19:39:05 -0400 |
commit | 860c0600143d56c7c083804d3dd0726010a6945c (patch) | |
tree | e8a6c8c13ad6eabee84993ddb1621ab7623a83da /includes/menu.inc | |
parent | e8a38c6175619fea2e3b1bbcc39c6a4cf35af5d6 (diff) | |
download | brdo-860c0600143d56c7c083804d3dd0726010a6945c.tar.gz brdo-860c0600143d56c7c083804d3dd0726010a6945c.tar.bz2 |
Issue #2425259 by catch, sidharrell, nlisgo, Josh Waihi, Fabianx, Berdir, martin107: Router rebuild lock_wait() condition can result in rebuild later in the request (race condition)
Diffstat (limited to 'includes/menu.inc')
-rw-r--r-- | includes/menu.inc | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index 2bfa39f66..8e26b6dee 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -456,7 +456,9 @@ function menu_get_item($path = NULL, $router_item = NULL) { // Rebuild if we know it's needed, or if the menu masks are missing which // occurs rarely, likely due to a race condition of multiple rebuilds. if (variable_get('menu_rebuild_needed', FALSE) || !variable_get('menu_masks', array())) { - menu_rebuild(); + if (_menu_check_rebuild()) { + menu_rebuild(); + } } $original_map = arg(NULL, $path); @@ -2694,6 +2696,21 @@ function menu_reset_static_cache() { } /** + * Checks whether a menu_rebuild() is necessary. + */ +function _menu_check_rebuild() { + // To absolutely ensure that the menu rebuild is required, re-load the + // variables in case they were set by another process. + $variables = variable_initialize(); + if (empty($variables['menu_rebuild_needed']) && !empty($variables['menu_masks'])) { + unset($GLOBALS['conf']['menu_rebuild_needed']); + $GLOBALS['conf']['menu_masks'] = $variables['menu_masks']; + return FALSE; + } + return TRUE; +} + +/** * Populates the database tables used by various menu functions. * * This function will clear and populate the {menu_router} table, add entries @@ -2713,6 +2730,14 @@ function menu_rebuild() { // We choose to block here since otherwise the router item may not // be available in menu_execute_active_handler() resulting in a 404. lock_wait('menu_rebuild'); + + if (_menu_check_rebuild()) { + // If we get here and menu_masks was not set, then it is possible a menu + // is being reloaded, or that the process rebuilding the menu was unable + // to complete successfully. A missing menu_masks variable could result + // in a 404, so re-run the function. + return menu_rebuild(); + } return FALSE; } @@ -2737,6 +2762,12 @@ function menu_rebuild() { $transaction->rollback(); watchdog_exception('menu', $e); } + // Explicitly commit the transaction now; this ensures that the database + // operations during the menu rebuild are committed before the lock is made + // available again, since locks may not always reside in the same database + // connection. The lock is acquired outside of the transaction so should also + // be released outside of it. + unset($transaction); lock_release('menu_rebuild'); return TRUE; |