[JENKINS-25559] Missing hash in client names if ClientNameFormat substitution fails - Jenkins Jira

XML

Word

Printable

Details

Type: Bug
Status: Resolved (View Workflow)
Priority: Blocker
Resolution: Fixed
Component/s: p4-plugin
Labels:

Similar Issues:

Show

Description

This bug appears in the following conditions:

Client name contains ${EXECUTOR_NUMBER} variable

High-priority issue appears if:

Concurrent builds are enabled
No NODE_NAME variable in client name
=> Missing hash in Client name => collisions in workspaces on different nodes

Attachments

Issue Links

is related to

JENKINS-23467 Streamline the variables handling

Resolved

JENKINS-25226 Perforce Plugin Substitutes default Parameter Value instead of actual Parameter Value for client name

Resolved

links to

PR #60

Activity

Ascending order - Click to sort in descending order

Oleg Nenashev created issue - 2014-11-12 07:20

Oleg Nenashev made changes - 2014-11-12 07:20

Field	Original Value	New Value
Link		This issue is related to ~~JENKINS-25226~~ [ ~~JENKINS-25226~~ ]

Hide

Permalink

Oleg Nenashev added a comment - 2014-11-12 07:21

Caused by ~~JENKINS-23467~~

Show

Oleg Nenashev added a comment - 2014-11-12 07:21 Caused by JENKINS-23467

Oleg Nenashev made changes - 2014-11-12 07:21

Link

This issue is related to ~~JENKINS-23467~~ [ ~~JENKINS-23467~~ ]

Oleg Nenashev made changes - 2014-11-12 07:22

Status

Open [ 1 ]

In Progress [ 3 ]

Hide

Permalink

Oleg Nenashev added a comment - 2014-11-12 07:23

Fixed by Stuart Rowe in https://github.com/jenkinsci/perforce-plugin/pull/60

Show

Oleg Nenashev added a comment - 2014-11-12 07:23 Fixed by Stuart Rowe in https://github.com/jenkinsci/perforce-plugin/pull/60

Oleg Nenashev made changes - 2014-11-12 07:23

Remote Link

This issue links to "PR #60 (Web Link)" [ 11907 ]

Oleg Nenashev made changes - 2014-11-12 07:23

Assignee

Rob Petti [ rpetti ]

Oleg Nenashev [ oleg_nenashev ]

Hide

Permalink

SCM/JIRA link daemon added a comment - 2014-11-12 07:25

Code changed in jenkins
User: Oleg Nenashev
Path:
src/main/java/hudson/plugins/perforce/PerforceSCM.java
http://jenkins-ci.org/commit/perforce-plugin/b3c84d1f4db2175273dce62652fea041e8ae2ac5
Log:
Merge pull request #60 from stuartrowe/master

[FIXED JENKINS-25559] - Don't rename remote clients in concurrent builds

Compare: https://github.com/jenkinsci/perforce-plugin/compare/71dd14e84751...b3c84d1f4db2

Show

SCM/JIRA link daemon added a comment - 2014-11-12 07:25 Code changed in jenkins User: Oleg Nenashev Path: src/main/java/hudson/plugins/perforce/PerforceSCM.java http://jenkins-ci.org/commit/perforce-plugin/b3c84d1f4db2175273dce62652fea041e8ae2ac5 Log: Merge pull request #60 from stuartrowe/master [FIXED JENKINS-25559] - Don't rename remote clients in concurrent builds Compare: https://github.com/jenkinsci/perforce-plugin/compare/71dd14e84751...b3c84d1f4db2

SCM/JIRA link daemon made changes - 2014-11-12 07:25

Resolution		Fixed [ 1 ]
Status	In Progress [ 3 ]	Resolved [ 5 ]

Hide

Permalink

Oleg Nenashev added a comment - 2014-11-12 15:09

The fix does not resolve the issue
New PR: https://github.com/jenkinsci/perforce-plugin/pull/61

Seems MacroSubstitutionHelper should catch recursion calls to prevent the issue

Show

Oleg Nenashev added a comment - 2014-11-12 15:09 The fix does not resolve the issue New PR: https://github.com/jenkinsci/perforce-plugin/pull/61 Seems MacroSubstitutionHelper should catch recursion calls to prevent the issue

Oleg Nenashev made changes - 2014-11-12 15:09

Resolution	Fixed [ 1 ]
Status	Resolved [ 5 ]	Reopened [ 4 ]

Hide

Permalink

Rob Petti added a comment - 2014-11-12 15:17

This is a configuration issue, isn't it? If you don't have the nodename, hostname, or hash in the client name for slaves option, then you will get collisions.

Show

Rob Petti added a comment - 2014-11-12 15:17 This is a configuration issue, isn't it? If you don't have the nodename, hostname, or hash in the client name for slaves option, then you will get collisions.

Hide

Permalink

Oleg Nenashev added a comment - 2014-11-12 15:33 - edited

If PerforceSCM fails to resolve the client name (it happens due to unresolved EXECUTOR_NUMBER), it fall-backs to a default value without a hash.
Currently, I'm working on this issue. The proper way would be to limit the number of nested recursions in buildEnvVars() by 2 instead of 1 (current implementation)

private String getEffectiveClientName(@Nonnull AbstractBuild build, @CheckForNull Map<String,String> env) 
            throws ParameterSubstitutionException, InterruptedException {
        Node buildNode = build.getBuiltOn();
        FilePath workspace = build.getWorkspace();
        String effectiveP4Client = this.p4Client;
        try {
            effectiveP4Client = getEffectiveClientName(effectiveP4Client, build);
        } catch (Exception e) {
            new StreamTaskListener(System.out).getLogger().println(
                    "Could not get effective client name: " + e.getMessage());
        }
        effectiveP4Client = MacroStringHelper.substituteParameters(effectiveP4Client, this, build, env);
        return effectiveP4Client;
    }

Show

Oleg Nenashev added a comment - 2014-11-12 15:33 - edited If PerforceSCM fails to resolve the client name (it happens due to unresolved EXECUTOR_NUMBER), it fall-backs to a default value without a hash. Currently, I'm working on this issue. The proper way would be to limit the number of nested recursions in buildEnvVars() by 2 instead of 1 (current implementation) private String getEffectiveClientName(@Nonnull AbstractBuild build, @CheckForNull Map<String,String> env) throws ParameterSubstitutionException, InterruptedException { Node buildNode = build.getBuiltOn(); FilePath workspace = build.getWorkspace(); String effectiveP4Client = this.p4Client; try { effectiveP4Client = getEffectiveClientName(effectiveP4Client, build); } catch (Exception e) { new StreamTaskListener(System.out).getLogger().println( "Could not get effective client name: " + e.getMessage()); } effectiveP4Client = MacroStringHelper.substituteParameters(effectiveP4Client, this, build, env); return effectiveP4Client; }

Hide

Permalink

Oleg Nenashev added a comment - 2014-11-12 15:46

Rob Petti
IMO it would be preferable to completely prohibit runtime variables in client names, but it will break many use-cases.
I'll try to find a convenient solution

Show

Oleg Nenashev added a comment - 2014-11-12 15:46 Rob Petti IMO it would be preferable to completely prohibit runtime variables in client names, but it will break many use-cases. I'll try to find a convenient solution

Oleg Nenashev made changes - 2014-12-01 10:44

Summary

Missing hash in client names with EXECUTOR_NUMBER leads to workspace collisions

Missing hash in client names if ClientNameFormat substitution fails

Hide

Permalink

Oleg Nenashev added a comment - 2014-12-01 10:45

The issue has been fixed in PR #60 and PR #61
https://github.com/jenkinsci/perforce-plugin/pull/61
https://github.com/jenkinsci/perforce-plugin/pull/60

Automatic SCM Linking does not work

Show

Oleg Nenashev added a comment - 2014-12-01 10:45 The issue has been fixed in PR #60 and PR #61 https://github.com/jenkinsci/perforce-plugin/pull/61 https://github.com/jenkinsci/perforce-plugin/pull/60 Automatic SCM Linking does not work

Hide

Permalink

Oleg Nenashev added a comment - 2014-12-11 02:55

1.3.31 should resolve the issue.
// SCM Link bot seems to be dead

Show

Oleg Nenashev added a comment - 2014-12-11 02:55 1.3.31 should resolve the issue. // SCM Link bot seems to be dead

Oleg Nenashev made changes - 2014-12-11 02:55

Resolution		Fixed [ 1 ]
Status	Reopened [ 4 ]	Resolved [ 5 ]

R. Tyler Croy made changes - 2016-07-25 23:56

Workflow

JNJira [ 159531 ]

JNJira + In-Review [ 196115 ]

Jenkins IRC Bot made changes - 2019-12-11 06:03

Component/s		p4-plugin [ 19224 ]
Component/s	perforce-plugin [ 15506 ]

People

Assignee:: Oleg Nenashev

Reporter:: Oleg Nenashev

Votes:: 0 Vote for this issue

Watchers:: 3 Start watching this issue

Dates

Created:: 2014-11-12 07:20

Updated:: 2019-12-11 06:03

Resolved:: 2014-12-11 02:55