Commit 40154974 authored by Leigh B Stoller's avatar Leigh B Stoller

Fixes for exports_setup taking too long for geni user login.

1. I removed exports_setup from tbacct, we seem to have fixed all the
   places where we were touching the user home directory during account
   creation.

2. I also removed exports_setup from web login for nonlocal (geni) users,
   since nothing on the Cloudlab path touches the user home directory,
   including starting a new experiment (geni users are not allowed to use
   any other part of the web interface, so Emulab Classic is off limits).
parent 4c6dd2a0
......@@ -465,7 +465,7 @@ sub AddUser()
$UID = $SAVEUID;
$EUID = $UID;
if ($WITHZFS) {
if (0 && $WITHZFS) {
if ($ZFS_NOEXPORT) {
#
# Have to force the new directories to be exported.
......
......@@ -1030,7 +1030,8 @@ function DOLOGIN_MAGIC($uid, $uid_idx, $email = null,
DBQueryFatal("select UNIX_TIMESTAMP(weblogin_last),weblogin_last ".
" from users as u ".
"left join user_stats as s on s.uid_idx=u.uid_idx ".
"where u.uid_idx='$uid_idx'");
"where u.uid_idx='$uid_idx' and ".
" u.nonlocal_id is null");
if (mysql_num_rows($query_result)) {
$lastrow = mysql_fetch_row($query_result);
$lastlogin = $lastrow[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment