mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-18 21:55:45 +02:00
Code Issues Wiki Activity

[221211] Throw SystemLockTimeoutException in Sftp and FTP in case a lock can not be obtained

Browse source
This commit is contained in:
Martin Oberhuber 2008-05-07 03:32:59 +00:00
parent c2b968e905
commit 5aa99be837
2 changed files with 41 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/Activator.java
View file

@ -1,12 +1,12 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - initial API and implementation
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.services.ssh; package org.eclipse.rse.internal.services.ssh;
@ -31,7 +31,9 @@ public class Activator extends Plugin {
//The shared instance. //The shared instance.
private static Activator plugin; private static Activator plugin;
public static final String PLUGIN_ID = "org.eclipse.rse.services.ssh"; //$NON-NLS-1$
/** /**
* The constructor. * The constructor.
*/ */

43
rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java
View file

@ -68,8 +68,11 @@ import org.eclipse.rse.services.clientserver.FileTypeMatcher;
import org.eclipse.rse.services.clientserver.IMatcher; import org.eclipse.rse.services.clientserver.IMatcher;
import org.eclipse.rse.services.clientserver.NamePatternMatcher; import org.eclipse.rse.services.clientserver.NamePatternMatcher;
import org.eclipse.rse.services.clientserver.PathUtility; import org.eclipse.rse.services.clientserver.PathUtility;
import org.eclipse.rse.services.clientserver.messages.SystemLockTimeoutException;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.services.clientserver.messages.SystemOperationCancelledException;
import org.eclipse.rse.services.clientserver.messages.SystemUnexpectedErrorException;
import org.eclipse.rse.services.files.AbstractFileService; import org.eclipse.rse.services.files.AbstractFileService;
import org.eclipse.rse.services.files.HostFilePermissions; import org.eclipse.rse.services.files.HostFilePermissions;
import org.eclipse.rse.services.files.IFilePermissionsService; import org.eclipse.rse.services.files.IFilePermissionsService;
@ -77,7 +80,6 @@ import org.eclipse.rse.services.files.IFileService;
import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.services.files.IHostFile;
import org.eclipse.rse.services.files.IHostFilePermissions; import org.eclipse.rse.services.files.IHostFilePermissions;
import org.eclipse.rse.services.files.IHostFilePermissionsContainer; import org.eclipse.rse.services.files.IHostFilePermissionsContainer;
import org.eclipse.rse.services.files.RemoteFileCancelledException;
import org.eclipse.rse.services.files.RemoteFileIOException; import org.eclipse.rse.services.files.RemoteFileIOException;
import org.eclipse.rse.services.files.RemoteFileSecurityException; import org.eclipse.rse.services.files.RemoteFileSecurityException;
@ -377,10 +379,10 @@ public class SftpFileService extends AbstractFileService implements ISshService,
return fChannelSftp; return fChannelSftp;
} }
protected void progressTick(IProgressMonitor monitor, int ticks) throws RemoteFileCancelledException { protected void progressTick(IProgressMonitor monitor, int ticks) throws SystemOperationCancelledException {
if (monitor!=null) { if (monitor!=null) {
if (monitor.isCanceled()) { if (monitor.isCanceled()) {
throw new RemoteFileCancelledException(); throw new SystemOperationCancelledException();
} }
monitor.worked(ticks); monitor.worked(ticks);
} }
@ -463,7 +465,7 @@ public class SftpFileService extends AbstractFileService implements ISshService,
fDirChannelMutex.release(); fDirChannelMutex.release();
} }
} else { } else {
throw new RemoteFileCancelledException(); throw new SystemLockTimeoutException(Activator.PLUGIN_ID);
} }
if (node==null) { if (node==null) {
node = new SftpHostFile(remoteParent, fileName, false, false, false, 0, 0); node = new SftpHostFile(remoteParent, fileName, false, false, false, 0, 0);
@ -540,7 +542,7 @@ public class SftpFileService extends AbstractFileService implements ISshService,
if (haveSubMonitor) monitor.done(); else progressTick(monitor, 40); if (haveSubMonitor) monitor.done(); else progressTick(monitor, 40);
} }
} else { } else {
throw new RemoteFileCancelledException(); throw new SystemLockTimeoutException(Activator.PLUGIN_ID);
} }
return (IHostFile[])results.toArray(new IHostFile[results.size()]); return (IHostFile[])results.toArray(new IHostFile[results.size()]);
} }
@ -660,7 +662,7 @@ public class SftpFileService extends AbstractFileService implements ISshService,
channel.put(localFile.getAbsolutePath(), dst, sftpMonitor, mode); channel.put(localFile.getAbsolutePath(), dst, sftpMonitor, mode);
Activator.trace("SftpFileService.upload "+remoteFile+ " ok"); //$NON-NLS-1$ //$NON-NLS-2$ Activator.trace("SftpFileService.upload "+remoteFile+ " ok"); //$NON-NLS-1$ //$NON-NLS-2$
if (monitor.isCanceled()) { if (monitor.isCanceled()) {
throw new RemoteFileCancelledException(); throw new SystemOperationCancelledException();
} else { } else {
SftpATTRS attr = channel.stat(dst); SftpATTRS attr = channel.stat(dst);
attr.setACMODTIME(attr.getATime(), (int)(localFile.lastModified()/1000)); attr.setACMODTIME(attr.getATime(), (int)(localFile.lastModified()/1000));
@ -786,7 +788,7 @@ public class SftpFileService extends AbstractFileService implements ISshService,
channel.get(remotePathRecoded, localFile.getAbsolutePath(), sftpMonitor, mode); channel.get(remotePathRecoded, localFile.getAbsolutePath(), sftpMonitor, mode);
Activator.trace("SftpFileService.download "+remoteFile+ " ok"); //$NON-NLS-1$ //$NON-NLS-2$ Activator.trace("SftpFileService.download "+remoteFile+ " ok"); //$NON-NLS-1$ //$NON-NLS-2$
if (monitor.isCanceled()) { if (monitor.isCanceled()) {
throw new RemoteFileCancelledException(); throw new SystemOperationCancelledException();
} else { } else {
SftpATTRS attr = channel.stat(remotePathRecoded); SftpATTRS attr = channel.stat(remotePathRecoded);
localFile.setLastModified(1000L * attr.getMTime()); localFile.setLastModified(1000L * attr.getMTime());
@ -861,7 +863,7 @@ public class SftpFileService extends AbstractFileService implements ISshService,
fDirChannelMutex.release(); fDirChannelMutex.release();
} }
} else { } else {
throw new RemoteFileCancelledException(); throw new SystemLockTimeoutException(Activator.PLUGIN_ID);
} }
return result; return result;
} }
@ -884,7 +886,7 @@ public class SftpFileService extends AbstractFileService implements ISshService,
fDirChannelMutex.release(); fDirChannelMutex.release();
} }
} else { } else {
throw new RemoteFileCancelledException(); throw new SystemLockTimeoutException(Activator.PLUGIN_ID);
} }
return result; return result;
} }
@ -919,6 +921,9 @@ public class SftpFileService extends AbstractFileService implements ISshService,
//throw new RemoteFolderNotEmptyException(); //throw new RemoteFolderNotEmptyException();
String fullPathQuoted = PathUtility.enQuoteUnix(fullPathRecoded); String fullPathQuoted = PathUtility.enQuoteUnix(fullPathRecoded);
int rv = runCommand("rm -rf "+fullPathQuoted, monitor); //$NON-NLS-1$ int rv = runCommand("rm -rf "+fullPathQuoted, monitor); //$NON-NLS-1$
if (rv != 0) {
throw new SystemUnexpectedErrorException(Activator.PLUGIN_ID);
}
} else { } else {
throw e; throw e;
} }
@ -933,6 +938,8 @@ public class SftpFileService extends AbstractFileService implements ISshService,
} finally { } finally {
fDirChannelMutex.release(); fDirChannelMutex.release();
} }
} else {
throw new SystemLockTimeoutException(Activator.PLUGIN_ID);
} }
} }
@ -950,6 +957,8 @@ public class SftpFileService extends AbstractFileService implements ISshService,
} finally { } finally {
fDirChannelMutex.release(); fDirChannelMutex.release();
} }
} else {
throw new SystemLockTimeoutException(Activator.PLUGIN_ID);
} }
} }
@ -1032,7 +1041,10 @@ public class SftpFileService extends AbstractFileService implements ISshService,
Activator.trace("SftpFileService.move "+srcName); //$NON-NLS-1$ Activator.trace("SftpFileService.move "+srcName); //$NON-NLS-1$
String fullPathOld = PathUtility.enQuoteUnix(recode(concat(srcParent, srcName))); String fullPathOld = PathUtility.enQuoteUnix(recode(concat(srcParent, srcName)));
String fullPathNew = PathUtility.enQuoteUnix(recodeSafe(concat(tgtParent, tgtName))); String fullPathNew = PathUtility.enQuoteUnix(recodeSafe(concat(tgtParent, tgtName)));
runCommand("mv "+fullPathOld+' '+fullPathNew, monitor); //$NON-NLS-1$ int rv = runCommand("mv " + fullPathOld + ' ' + fullPathNew, monitor); //$NON-NLS-1$
if (rv != 0) {
throw new SystemUnexpectedErrorException(Activator.PLUGIN_ID);
}
} }
public void copy(String srcParent, String srcName, String tgtParent, String tgtName, IProgressMonitor monitor) throws SystemMessageException { public void copy(String srcParent, String srcName, String tgtParent, String tgtName, IProgressMonitor monitor) throws SystemMessageException {
@ -1042,7 +1054,10 @@ public class SftpFileService extends AbstractFileService implements ISshService,
Activator.trace("SftpFileService.copy "+srcName); //$NON-NLS-1$ Activator.trace("SftpFileService.copy "+srcName); //$NON-NLS-1$
String fullPathOld = PathUtility.enQuoteUnix(recode(concat(srcParent, srcName))); String fullPathOld = PathUtility.enQuoteUnix(recode(concat(srcParent, srcName)));
String fullPathNew = PathUtility.enQuoteUnix(recodeSafe(concat(tgtParent, tgtName))); String fullPathNew = PathUtility.enQuoteUnix(recodeSafe(concat(tgtParent, tgtName)));
runCommand("cp -Rp "+fullPathOld+' '+fullPathNew, monitor); //$NON-NLS-1$ int rv = runCommand("cp -Rp " + fullPathOld + ' ' + fullPathNew, monitor); //$NON-NLS-1$
if (rv != 0) {
throw new SystemUnexpectedErrorException(Activator.PLUGIN_ID);
}
} }
public void copyBatch(String[] srcParents, String[] srcNames, String tgtParent, IProgressMonitor monitor) throws SystemMessageException public void copyBatch(String[] srcParents, String[] srcNames, String tgtParent, IProgressMonitor monitor) throws SystemMessageException
@ -1093,6 +1108,8 @@ public class SftpFileService extends AbstractFileService implements ISshService,
} finally { } finally {
fDirChannelMutex.release(); fDirChannelMutex.release();
} }
} else {
throw new SystemLockTimeoutException(Activator.PLUGIN_ID);
} }
} }
@ -1123,6 +1140,8 @@ public class SftpFileService extends AbstractFileService implements ISshService,
} finally { } finally {
fDirChannelMutex.release(); fDirChannelMutex.release();
} }
} else {
throw new SystemLockTimeoutException(Activator.PLUGIN_ID);
} }
} }
@ -1197,7 +1216,7 @@ public class SftpFileService extends AbstractFileService implements ISshService,
throw makeSystemMessageException(e); throw makeSystemMessageException(e);
} }
if (monitor.isCanceled()) { if (monitor.isCanceled()) {
throw new RemoteFileCancelledException(); throw new SystemOperationCancelledException();
} }
return stream; return stream;
} }