134dd0797da608e6b1291f4db6bb5c1033efbfca
chmalee
  Thu Jun 5 15:32:25 2025 -0700
Revert "Make the serverName a required input to hubspace uploads so the hubspace machine can determine where to place uploads. Prevents any current or future username collisions between euro and rr and prevents tusd temp file collisions between the machines, refs #31058"

This reverts commit b318572799b35ed9cd6fabdeb247495d72d4da4c.

diff --git src/hg/inc/userdata.h src/hg/inc/userdata.h
index 34d4e99a3f9..f4d5b5d1e42 100644
--- src/hg/inc/userdata.h
+++ src/hg/inc/userdata.h
@@ -1,95 +1,92 @@
 /* userdata.c - code for managing data stored on a per user basis */
 
 /* Copyright (C) 2014 The Regents of the University of California 
  * See kent/LICENSE or http://genome.ucsc.edu/license/ for licensing information. */
 
 #ifndef USERDATA_H
 #define USERDATA_H
 
 #include "hubSpace.h"
 
 struct userFiles
 {
 char *userName;
 struct fileInfo *fileList; // list of files for this user
 };
 
 struct userHubs
 {
 struct userHubs *next;
 char *hubName; // name of this hub
 char *genome; // only one genome allowed per hub for now
 char *userName; // for convenience
 time_t lastModified; // actually last access time but this works
 struct userFiles *fileList; // list of files (tracks) in the hub
 };
 
 char *getUserName();
 /* Query the right system for the users name */
 
 char *emailForUserName(char *userName);
 /* Fetch the email for this user from gbMembers hgcentral table */
 
 // the various quota helper variables:
 #define HUB_SPACE_DEFAULT_QUOTA_BYTES 10000000000
 #define HUB_SPACE_DEFAULT_QUOTA HUB_SPACE_DEFAULT_QUOTA_BYTES 
 // for defining the quota in hg.conf
 #define HUB_SPACE_CONF_QUOTA_VAR "hubspace.quota"
 
-char *webDataDir(char *userName, char *serverName);
+char *webDataDir(char *userName);
 /* Return a web accesible path to the userDataDir, this is different from the full path tusd uses */
 
-char *urlForFile(char *userName, char *filePath, char *serverName);
+char *urlForFile(char *userName, char *filePath);
 /* Return a web accessible URL to filePath */
 
-char *getEncodedUserNamePath(char *userName);
-/* Compute the path for just the userName part of the users upload */
-
-char *getDataDir(char *userName, char *serverName);
+char *getDataDir(char *userName);
 /* Return the full path to the user specific data directory, can be configured via hg.conf
- * on hgwdev, this is /data/tusd
- * serverName is required, that becomes a prefix for separating uploads by machine */
+ * on hgwdev, this is /data/apache/userdata/userStore/hash/userName/
+ * on the RR, this is /userdata/userStore/hash/userName/ */
 
-char *stripDataDir(char *fname, char *userName, char *serverName);
-/* Strips the getDataDir(userName, serverName) off of fname */
+char *stripDataDir(char *fname, char *userName);
+/* Strips the getDataDir(userName) off of fname */
 
-char *prefixUserFile(char *userName, char *fname, char *parentDir, char *serverName);
+char *prefixUserFile(char *userName, char *fname, char *parentDir);
 /* Allocate a new string that contains the full per-user path to fname. return NULL if
  * we cannot construct a full path because of a realpath(3) failure.
  * parentDir is optional and will go in between the per-user dir and the fname */
 
 char *hubNameFromPath(char *path);
 /* Return the last directory component of path. Assume that a '.' char in the last component
  * means that component is a filename and go back further */
 
 char *writeHubText(char *path, char *userName, char *db);
 /* Create a hub.txt file, optionally creating the directory holding it. For convenience, return
  * the file name of the created hub, which can be freed. */
 
 void createNewTempHubForUpload(char *requestId, struct hubSpace *rowForFile, char *userDataDir, char *parentDir);
 /* Creates a hub.txt for this upload, and updates the hubSpace table for the
  * hub.txt and any parentDirs we need to create. */
 
 void addHubSpaceRowForFile(struct hubSpace *row);
 /* We created a file for a user, now add an entry to the hubSpace table for it */
 
 void makeParentDirRows(char *userName, time_t lastModified, char *db, char *parentDirStr, char *userDataDir);
 /* For each '/' separated component of parentDirStr, create a row in hubSpace. Return the 
  * final subdirectory component of parentDirStr */
 
-void removeFileForUser(char *fname, char *userName, char *serverName);
+void removeFileForUser(char *fname, char *userName);
 /* Remove a file for this user if it exists */
 
 struct hubSpace *listFilesForUser(char *userName);
 /* Return the files the user has uploaded */
 
 char *defaultHubNameForUser(char *userName);
 /* Return a name to use as a default for a hub, starts with myFirstHub, then myFirstHub2, ... */
 
 long long getMaxUserQuota(char *userName);
 /* Return how much space is allocated for this user or the default */
 
 long long checkUserQuota(char *userName);
 /* Return the amount of space a user is currently using */
 
 #endif /* USERDATA_H */